Add evm function call

.github/workflows/playwright.yml

@@ -76,6 +76,10 @@ jobs:
           MULTICHAIN_TEST_ACCOUNT_ID: ${{ secrets.MULTICHAIN_TEST_ACCOUNT_ID }}
           MULTICHAIN_TEST_ACCOUNT_FAK: ${{ secrets.MULTICHAIN_TEST_ACCOUNT_FAK }}
           MULTICHAIN_TEST_ACCOUNT_LAK: ${{ secrets.MULTICHAIN_TEST_ACCOUNT_LAK }}
+          MULTICHAIN_TEST_ACCOUNT_ID_2: ${{ secrets.MULTICHAIN_TEST_ACCOUNT_ID_2 }}
+          MULTICHAIN_TEST_ACCOUNT_FAK_2: ${{ secrets.MULTICHAIN_TEST_ACCOUNT_FAK_2 }}
+          MULTICHAIN_TEST_ACCOUNT_ID_3: ${{ secrets.MULTICHAIN_TEST_ACCOUNT_ID_3 }}
+          MULTICHAIN_TEST_ACCOUNT_FAK_3: ${{ secrets.MULTICHAIN_TEST_ACCOUNT_FAK_3 }}
           ETH_PROVIDER_URL_TESTNET: ${{ secrets.ETH_PROVIDER_URL_TESTNET }}
           BNB_PROVIDER_URL_TESTNET: ${{ secrets.BNB_PROVIDER_URL_TESTNET }}
           BTC_PROVIDER_URL_TESTNET: ${{ secrets.BTC_PROVIDER_URL_TESTNET }}

package.json

@@ -4,7 +4,10 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "yarn && yarn workspace near-fast-auth-signer-e2e-tests test"
+    "test": "yarn && yarn workspace near-fast-auth-signer-e2e-tests test", 
+    "test:multichain-testnet": "yarn && yarn workspace near-fast-auth-signer-e2e-tests test:multichain-testnet",
+    "test:multichain-local": "yarn && yarn workspace near-fast-auth-signer-e2e-tests test:multichain-local",
+    "test:remaining": "yarn && yarn workspace near-fast-auth-signer-e2e-tests test:remaining"
   },
   "devDependencies": {
     "@types/node": "^20.9.0",

packages/near-fast-auth-signer-e2e-tests/.gitignore

@@ -29,3 +29,18 @@ yarn-error.log*
 /playwright-report/
 /blob-report/
 /playwright/.cache/
+
+# Hardhat files
+/cache
+/artifacts
+
+# TypeChain files
+/typechain
+/typechain-types
+
+# solidity-coverage files
+/coverage
+/coverage.json
+
+# Hardhat Ignition default folder for deployments against a local node
+ignition/deployments/chain-31337

packages/near-fast-auth-signer-e2e-tests/contracts/FT.sol

@@ -0,0 +1,92 @@
+// Origal repo: https://github.com/Consensys/Tokens/blob/master/contracts/eip20/EIP20.sol
+
+pragma solidity ^0.8.24;
+
+interface EIP20Interface {
+    function totalSupply() external view returns (uint256);
+    function balanceOf(address _owner) external view returns (uint256 balance);
+    function transfer(address _to, uint256 _value) external returns (bool success);
+    function transferFrom(address _from, address _to, uint256 _value) external returns (bool success);
+    function approve(address _spender, uint256 _value) external returns (bool success);
+    function allowance(address _owner, address _spender) external view returns (uint256 remaining);
+    function mint(address _to, uint256 _amount) external returns (bool success);
+
+    event Transfer(address indexed _from, address indexed _to, uint256 _value);
+    event Approval(address indexed _owner, address indexed _spender, uint256 _value);
+}
+
+contract EIP20 is EIP20Interface {
+
+    uint256 constant private MAX_UINT256 = type(uint256).max;
+    mapping (address => uint256) public balances;
+    mapping (address => mapping (address => uint256)) public allowed;
+    string public name;
+    uint8 public decimals;
+    string public symbol;
+    uint256 private _totalSupply;
+
+    constructor(
+        uint256 _initialAmount,
+        string memory _tokenName,
+        uint8 _decimalUnits,
+        string memory _tokenSymbol
+    ) {
+        balances[msg.sender] = _initialAmount;
+        _totalSupply = _initialAmount;
+        name = _tokenName;
+        decimals = _decimalUnits;
+        symbol = _tokenSymbol;
+    }
+
+    function totalSupply() external view override returns (uint256) {
+        return _totalSupply;
+    }
+
+    function balanceOf(address _owner) public view override returns (uint256 balance) {
+        return balances[_owner];
+    }
+
+    function transfer(address _to, uint256 _value) public override returns (bool success) {
+        require(balances[msg.sender] >= _value, "Insufficient balance");
+        unchecked {
+            balances[msg.sender] -= _value;
+            balances[_to] += _value;
+        }
+        emit Transfer(msg.sender, _to, _value);
+        return true;
+    }
+
+    function transferFrom(address _from, address _to, uint256 _value) public override returns (bool success) {
+        uint256 currentAllowance = allowed[_from][msg.sender];
+        require(balances[_from] >= _value && currentAllowance >= _value, "Insufficient balance or allowance");
+        unchecked {
+            balances[_to] += _value;
+            balances[_from] -= _value;
+            if (currentAllowance < MAX_UINT256) {
+                allowed[_from][msg.sender] -= _value;
+            }
+        }
+        emit Transfer(_from, _to, _value);
+        return true;
+    }
+
+    function approve(address _spender, uint256 _value) public override returns (bool success) {
+        allowed[msg.sender][_spender] = _value;
+        emit Approval(msg.sender, _spender, _value);
+        return true;
+    }
+
+    function allowance(address _owner, address _spender) public view override returns (uint256 remaining) {
+        return allowed[_owner][_spender];
+    }
+
+    function mint(address _to, uint256 _amount) external override returns (bool success) {
+        require(_to != address(0), "ERC20: mint to the zero address");
+        _totalSupply += _amount;
+        unchecked {
+            balances[_to] += _amount;
+        }
+        emit Transfer(address(0), _to, _amount);
+        return true;
+    }
+}

packages/near-fast-auth-signer-e2e-tests/hardhat.config.ts

@@ -0,0 +1,12 @@
+require('@nomicfoundation/hardhat-toolbox');
+
+const config = {
+  solidity: '0.8.24',
+  networks: {
+    hardhat: {
+      port: 8545
+    }
+  }
+};
+
+module.exports = config;

packages/near-fast-auth-signer-e2e-tests/package.json

@@ -14,7 +14,11 @@
   ],
   "scripts": {
     "test": "yarn playwright test",
-    "start": "webpack serve --mode development --history-api-fallback"
+    "test:multichain-testnet": "yarn playwright test --grep @multichain-testnet",
+    "test:multichain-local": "yarn playwright test --grep @multichain-local",
+    "test:remaining": "yarn playwright test --grep-invert \"@multichain-testnet|@multichain-local\"",
+    "start": "webpack serve --mode development --history-api-fallback",
+    "start:hardhat": "hardhat compile && hardhat node"
   },
   "dependencies": {
     "@near-js/crypto": "^1.2.3",
@@ -23,16 +27,16 @@
     "@near-wallet-selector/core": "8.7.0",
     "bitcoinjs-lib": "^6.1.5",
     "borsh": "0.7.0",
-    "canonicalize": "^2.0.0",
+    "ethers": "^6.13.1",
     "firebase-admin": "^12.1.0",
     "fs-extra": "^11.2.0",
     "https-browserify": "^1.0.0",
     "js-sha256": "^0.11.0",
     "mailpop3": "^0.1.0",
-    "multichain-tools": "^1.0.12",
+    "multichain-tools": "2.0.14-beta.2",
     "near-api-js": "^2.1.4",
     "near-fast-auth-signer": "*",
-    "near-fastauth-wallet": "^0.0.17",
+    "near-fastauth-wallet": "2.0.2-beta.4",
     "process": "^0.11.10",
     "proper-lockfile": "^4.1.2",
     "react": "^18.2.0",
@@ -46,14 +50,31 @@
   "devDependencies": {
     "@babel/preset-env": "^7.23.3",
     "@babel/preset-react": "^7.23.3",
+    "@nomicfoundation/hardhat-chai-matchers": "^2.0.0",
+    "@nomicfoundation/hardhat-ethers": "^3.0.0",
+    "@nomicfoundation/hardhat-ignition": "^0.15.0",
+    "@nomicfoundation/hardhat-ignition-ethers": "^0.15.0",
+    "@nomicfoundation/hardhat-network-helpers": "^1.0.0",
+    "@nomicfoundation/hardhat-toolbox": "^5.0.0",
+    "@nomicfoundation/hardhat-verify": "^2.0.0",
     "@playwright/test": "^1.44.0",
-    "@types/node": "^20.9.0",
+    "@typechain/ethers-v6": "^0.5.0",
+    "@typechain/hardhat": "^9.0.0",
+    "@types/chai": "^4.2.0",
+    "@types/mocha": ">=9.1.0",
     "@types/uuid": "^9.0.8",
+    "chai": "^4.2.0",
+    "ethers": "^6.4.0",
+    "hardhat": "^2.14.0",
+    "hardhat-gas-reporter": "^1.0.8",
     "playwright": "^1.44.0",
-    "ts-node": "^10.9.2",
+    "solidity-coverage": "^0.8.0",
+    "ts-node": ">=8.0.0",
+    "typechain": "^8.3.0",
+    "typescript": ">=4.5.0",
     "webpack": "^5.89.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
   },
   "private": true
-}
+}

packages/near-fast-auth-signer-e2e-tests/playwright.config.ts

@@ -60,15 +60,21 @@ export default defineConfig<TestOptions>({
   ],
 
   /* Run your local dev serve`r` before starting the tests */
-  webServer: [{
-    command:             'cd ../near-fast-auth-signer && NETWORK_ID=testnet yarn run start:test',
-    url:                 'http://127.0.0.1:3000',
-    reuseExistingServer: !process.env.CI,
-  },
-  {
-    command:             'yarn run start',
-    url:                 'http://127.0.0.1:3001',
-    reuseExistingServer: !process.env.CI,
-  }
+  webServer: [
+    {
+      command:             'cd ../near-fast-auth-signer && NETWORK_ID=testnet yarn run start:test',
+      url:                 'http://127.0.0.1:3000',
+      reuseExistingServer: !process.env.CI,
+    },
+    {
+      command:             'yarn run start:hardhat',
+      url:                 'http://127.0.0.1:8545',
+      reuseExistingServer: !process.env.CI,
+    },
+    {
+      command:             'yarn run start',
+      url:                 'http://127.0.0.1:3001',
+      reuseExistingServer: !process.env.CI,
+    }
   ],
 });

packages/near-fast-auth-signer-e2e-tests/scripts/faucet.ts

@@ -1,3 +1,5 @@
+import { derivedAddresses } from '../utils/constants';
+
 const { ethers } = require('ethers');
 
 interface WalletInfo {
@@ -83,9 +85,11 @@ async function requestTokensFromFaucet(wallets: WalletInfo[]): Promise<void> {
   }
 }
 
-const wallets: WalletInfo[] = [
-  { address: '0xf64750f13f75fb9e2f4d9fd98ab72d742d1e33eb', chain: 'eth' },
-  { address: '0x81d205120a9f04d3f1ce733c5ed0a0bc66714c71', chain: 'bnb' }
+export const walletsAddresses: WalletInfo[] = [
+  { address: derivedAddresses.EVM_PERSONAL, chain: 'eth' },
+  { address: derivedAddresses.EVM_PERSONAL_2, chain: 'eth' },
+  { address: derivedAddresses.EVM_PERSONAL_3, chain: 'eth' },
+  { address: derivedAddresses.EVM_DOMAIN, chain: 'bnb' }
 ];
 
-requestTokensFromFaucet(wallets);
+requestTokensFromFaucet(walletsAddresses);

packages/near-fast-auth-signer-e2e-tests/test-app/App.tsx

@@ -1,24 +1,25 @@
-import { SignMessageParams } from '@near-wallet-selector/core';
+import { Account, SignMessageParams } from '@near-wallet-selector/core';
+import { FastAuthWallet } from 'near-fastauth-wallet';
 import React, { useEffect, useState } from 'react';
 
-import SignMultiChain, { TransactionFormValues } from './components/SignMultiChain';
+import SignMultiChain from './components/SignMultiChain';
 import useWalletSelector from './hooks/useWalletSelector';
-import {
-  getTransactionPayload,
-} from '../utils/multiChain';
+
+type FastAuthWalletInterface = Awaited<ReturnType<typeof FastAuthWallet>>;
 
 export default function App() {
   const selectorInstance = useWalletSelector();
-  const [fastAuthWallet, setFastAuthWallet] = useState<any>();
-  const [accounts, setAccounts] = useState<any[] | undefined>(undefined);
+  const [fastAuthWallet, setFastAuthWallet] = useState<FastAuthWalletInterface | null>(null);
+  const [accounts, setAccounts] = useState<Account[] | undefined>(undefined);
   const [isMessageSignatureValid, setIsMessageSignatureValid] = useState(false);
 
   useEffect(() => {
     const getWallet = async () => {
       if (!selectorInstance) return;
 
       const wallet = await selectorInstance.wallet('fast-auth-wallet');
-      setFastAuthWallet(wallet);
+      // Using any because the selector exposes the NEP wallet interface that cannot be cast to the current FastAuthWallet interface
+      setFastAuthWallet(wallet as any);
     };
 
     getWallet();
@@ -64,19 +65,15 @@ export default function App() {
     try {
       setIsMessageSignatureValid(false);
       const messageSignature = await fastAuthWallet.signMessage(signMessageParams);
-      const isValid = await fastAuthWallet.verifySignMessage(signMessageParams, messageSignature);
-      setIsMessageSignatureValid(isValid);
+      if (messageSignature) {
+        const isValid = await fastAuthWallet.verifySignMessage(signMessageParams, messageSignature);
+        setIsMessageSignatureValid(isValid);
+      }
     } catch (error) {
       console.error('Error signing message:', error);
     }
   };
 
-  const handleSubmitTransaction = async (values: TransactionFormValues) => {
-    const accountId = JSON.parse(window.localStorage.accountId);
-    const payload = await getTransactionPayload({ ...values, accountId });
-    await fastAuthWallet.signMultiChainTransaction(payload);
-  };
-
   if (!selectorInstance || !fastAuthWallet || accounts === undefined) {
     return (
       <div id="loading-ws">Loading...</div>
@@ -89,7 +86,6 @@ export default function App() {
       <button type="button" onClick={handleSignUp}>
         Create Account
       </button>
-
       {accounts.length > 0 ? (
         <div>
           <button type="button" onClick={handleSignOut}>
@@ -102,13 +98,13 @@ export default function App() {
           Sign In
         </button>
       )}
-      <SignMultiChain onSubmitForm={handleSubmitTransaction} />
+      <SignMultiChain />
       <button
         type="button"
         data-testid="sign-transaction-button"
         onClick={() => {
           fastAuthWallet
-            .signAndSendTransaction(
+            .signAndSendDelegateAction(
               JSON.parse(window.localStorage.transactionData)
             );
         }}