feat: solana connector (#137)

Co-authored-by: Luiz Estácio | stacio.eth <luizstacio@gmail.com>
Co-authored-by: Luiz Gomes <8636507+LuizAsFight@users.noreply.github.com>

Author: 3 people

.changeset/young-tigers-shop.md

@@ -0,0 +1,6 @@
+---
+"@fuel-connectors/walletconnect-connector": minor
+"@fuel-connectors/solana-connector": minor
+---
+
+Added Solana Connector using Wallet's Connect web3modal provider.

.gitignore

@@ -17,3 +17,4 @@ yarn-error.log*
 
 # Misc
 .DS_Store
+.zed

examples/react-app/src/main.tsx

@@ -14,8 +14,9 @@ import {
   FuelWalletConnector,
   FuelWalletDevelopmentConnector,
   FueletWalletConnector,
+  SolanaConnector,
+  WalletConnectConnector,
 } from '@fuels/connectors';
-import { WalletConnectConnector } from '@fuels/connectors/walletconnect';
 import { FuelProvider } from '@fuels/react';
 
 import * as Toast from '@radix-ui/react-toast';
@@ -75,6 +76,9 @@ ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
             }),
             new FuelWalletDevelopmentConnector(),
             new BurnerWalletConnector(),
+            new SolanaConnector({
+              projectId: WC_PROJECT_ID,
+            }),
           ],
         }}
       >

examples/react-next/src/components/Providers.tsx

@@ -8,8 +8,9 @@ import {
   FuelWalletConnector,
   FuelWalletDevelopmentConnector,
   FueletWalletConnector,
+  SolanaConnector,
+  WalletConnectConnector,
 } from '@fuels/connectors';
-import { WalletConnectConnector } from '@fuels/connectors/walletconnect';
 import { FuelProvider } from '@fuels/react';
 
 const queryClient = new QueryClient();
@@ -26,6 +27,7 @@ export const Providers = ({ children }: { children: React.ReactNode }) => {
             new BakoSafeConnector(),
             new FueletWalletConnector(),
             new WalletConnectConnector(),
+            new SolanaConnector(),
           ],
         }}
       >

packages/connectors/package.json

@@ -9,16 +9,6 @@
       "require": "./dist/index.js",
       "import": "./dist/index.mjs",
       "types": "./dist/index.d.ts"
-    },
-    "./walletconnect": {
-      "require": "./dist/walletconnect-connector/index.js",
-      "import": "./dist/walletconnect-connector/index.mjs",
-      "types": "./dist/walletconnect-connector/src/index.d.ts"
-    },
-    "./evm": {
-      "require": "./dist/evm-connector/index.js",
-      "import": "./dist/evm-connector/index.mjs",
-      "types": "./dist/evm-connector/src/index.d.ts"
     }
   },
   "files": ["dist"],
@@ -34,9 +24,14 @@
     "@ethereumjs/util": "9.0.3",
     "@ethersproject/bytes": "5.7.0",
     "@wagmi/core": "2.9.1",
-    "@web3modal/wagmi": "4.1.11",
+    "@web3modal/wagmi": "5.0.0",
     "viem": "2.10.2",
-    "socket.io-client": "4.7.2"
+    "socket.io-client": "4.7.2",
+    "@web3modal/solana": "5.0.0",
+    "@web3modal/scaffold": "5.0.0",
+    "@web3modal/core": "5.0.0",
+    "@solana/web3.js": "1.93.1",
+    "rpc-websockets": "7.11.0"
   },
   "devDependencies": {
     "@fuel-connectors/burner-wallet-connector": "workspace:*",
@@ -46,6 +41,7 @@
     "@fuel-connectors/fuelet-wallet": "workspace:*",
     "@fuel-connectors/walletconnect-connector": "workspace:*",
     "@fuel-connectors/bako-safe": "workspace:*",
+    "@fuel-connectors/solana-connector": "workspace:*",
     "fuels": "0.88.1",
     "terser": "5.31.0",
     "tsup": "8.0.2",

packages/connectors/src/defaultConnectors.ts

@@ -7,20 +7,26 @@ import { WalletConnectConnector } from '@fuel-connectors/walletconnect-connector
 import type { FuelConnector } from 'fuels';
 import type { BurnerWalletConfig } from '../../burner-wallet-connector/src/types';
 
+const DEFAULT_WC_PROJECT_ID = '00000000000000000000000000000000';
+
 type DefaultConnectors = {
   devMode?: boolean;
+  wcProjectId?: string;
   burnerWalletConfig?: BurnerWalletConfig;
 };
 
 export function defaultConnectors({
   devMode,
+  wcProjectId = DEFAULT_WC_PROJECT_ID,
   burnerWalletConfig,
 }: DefaultConnectors = {}): Array<FuelConnector> {
   const connectors = [
     new FuelWalletConnector(),
     new BakoSafeConnector(),
     new FueletWalletConnector(),
-    new WalletConnectConnector(),
+    new WalletConnectConnector({
+      projectId: wcProjectId,
+    }),
     new BurnerWalletConnector(burnerWalletConfig),
   ];
 

packages/connectors/src/index.ts

@@ -5,3 +5,4 @@ export * from '@fuel-connectors/fuelet-wallet';
 export * from '@fuel-connectors/bako-safe';
 export * from '@fuel-connectors/burner-wallet-connector';
 export * from '@fuel-connectors/walletconnect-connector';
+export * from '@fuel-connectors/solana-connector';

packages/connectors/src/solana-connector/index.ts

@@ -0,0 +1 @@
+export * from '@fuel-connectors/solana-connector';

packages/connectors/tsup.config.js

@@ -3,11 +3,7 @@ import { defineConfig } from 'tsup';
 
 export default defineConfig((options) => ({
   ...baseConfig(options, { withReact: false }),
-  entry: [
-    'src/index.ts',
-    'src/walletconnect-connector/index.ts',
-    'src/evm-connector/index.ts',
-  ],
+  entry: ['src/index.ts'],
   external: ['fuels'],
   noExternal: [
     '@fuel-connectors/fuel-development-wallet',
@@ -17,6 +13,7 @@ export default defineConfig((options) => ({
     '@fuel-connectors/evm-connector',
     '@fuel-connectors/walletconnect-connector',
     '@fuel-connectors/bako-safe',
+    '@fuel-connectors/solana-connector',
   ],
   minify: 'terser',
   dts: {
@@ -28,6 +25,7 @@ export default defineConfig((options) => ({
       '@fuel-connectors/evm-connector',
       '@fuel-connectors/walletconnect-connector',
       '@fuel-connectors/bako-safe',
+      '@fuel-connectors/solana-connector',
     ],
   },
   splitting: true,

packages/solana-connector/package.json

@@ -0,0 +1,55 @@
+{
+  "name": "@fuel-connectors/solana-connector",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "files": ["dist"],
+  "main": "./dist/wallet-connector-solana.umd.cjs",
+  "module": "./dist/wallet-connector-solana.js",
+  "exports": {
+    ".": {
+      "import": "./dist/wallet-connector-solana.js",
+      "require": "./dist/wallet-connector-solana.umd.cjs"
+    }
+  },
+  "types": "./dist/index.d.ts",
+  "scripts": {
+    "build:forc": "pnpm fuels-forc build --release --path ./predicate",
+    "build:resources": "pnpm run build:forc && tsx ./scripts/generatePredicateResources.ts",
+    "build": "tsup --dts-only",
+    "build:watch": "pnpm build --watch",
+    "ts:check": "tsc --noEmit",
+    "test": "vitest"
+  },
+  "peerDependencies": {
+    "@web3modal/scaffold": ">=5.0.0",
+    "@web3modal/core": ">=5.0.0",
+    "fuels": ">=0.88.1"
+  },
+  "dependencies": {
+    "@ethereumjs/util": "9.0.3",
+    "@ethersproject/bytes": "5.7.0",
+    "@solana/web3.js": "1.93.1",
+    "@web3modal/solana": "5.0.0",
+    "bs58": "6.0.0",
+    "memoizee": "0.4.15",
+    "tweetnacl": "1.0.3"
+  },
+  "devDependencies": {
+    "@fuel-ts/account": "0.88.1",
+    "@fuel-ts/forc": "0.88.1",
+    "@fuel-ts/fuel-core": "0.88.1",
+    "@types/memoizee": "0.4.11",
+    "fuels": "0.88.1",
+    "jsdom": "24.0.0",
+    "ts-loader": "9.5.1",
+    "ts-node": "10.9.2",
+    "tsup": "8.0.2",
+    "tsx": "4.9.3",
+    "typescript": "5.4.5",
+    "vite": "5.2.11",
+    "vite-plugin-dts": "3.9.1",
+    "vitest": "1.6.0",
+    "@web3modal/core": "5.0.0"
+  }
+}

packages/solana-connector/predicate/Forc.lock

@@ -0,0 +1,13 @@
+[[package]]
+name = "core"
+source = "path+from-root-148AAAB4460F1A9D"
+
+[[package]]
+name = "std"
+source = "git+https://github.com/fuellabs/sway?tag=v0.59.0#d9985d8111f94235edba9a08fc71a9513ec2a95c"
+dependencies = ["core"]
+
+[[package]]
+name = "verification-predicate"
+source = "member"
+dependencies = ["std"]

packages/solana-connector/predicate/Forc.toml

@@ -0,0 +1,5 @@
+[project]
+authors = ["Fuel Labs <contact@fuel.sh>"]
+entry = "main.sw"
+license = "Apache-2.0"
+name = "verification-predicate"

packages/solana-connector/predicate/fuel-toolchain.toml

@@ -0,0 +1,2 @@
+[toolchain]
+channel = "testnet"

packages/solana-connector/predicate/out/release/verification-predicate-abi.json

@@ -0,0 +1,54 @@
+{
+  "encoding": "1",
+  "types": [
+    {
+      "typeId": 0,
+      "type": "b256",
+      "components": null,
+      "typeParameters": null
+    },
+    {
+      "typeId": 1,
+      "type": "bool",
+      "components": null,
+      "typeParameters": null
+    },
+    {
+      "typeId": 2,
+      "type": "u64",
+      "components": null,
+      "typeParameters": null
+    }
+  ],
+  "functions": [
+    {
+      "inputs": [
+        {
+          "name": "witness_index",
+          "type": 2,
+          "typeArguments": null
+        }
+      ],
+      "name": "main",
+      "output": {
+        "name": "",
+        "type": 1,
+        "typeArguments": null
+      },
+      "attributes": null
+    }
+  ],
+  "loggedTypes": [],
+  "messagesTypes": [],
+  "configurables": [
+    {
+      "name": "SIGNER",
+      "configurableType": {
+        "name": "",
+        "type": 0,
+        "typeArguments": null
+      },
+      "offset": 2568
+    }
+  ]
+}

packages/solana-connector/predicate/out/release/verification-predicate-bin-root

@@ -0,0 +1 @@
+0x8f562b4f23ce90b0547d11e4e02462d3cd660f4f3fe5f719ae725eab4d7a5d42

packages/solana-connector/predicate/out/release/verification-predicate.bin

@@ -0,0 +1,68 @@
+predicate;
+
+use std::{
+    b512::B512,
+    constants::ZERO_B256,
+    hash::{
+        Hash,
+        sha256,
+    },
+    ecr::{
+        EcRecoverError,
+        ed_verify,
+    },
+    tx::{
+        tx_id,
+        tx_witness_data,
+    },
+    bytes::Bytes,
+};
+
+const ASCII_MAP: [u8; 16] = [
+    48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 97, 98, 99, 100, 101, 102
+];
+
+pub fn create_txid_small(tx_id: b256) -> b256 {
+    let mut ascii_bytes = Bytes::with_capacity(32);
+    let bytes_ascii = b256_to_ascii_bytes(tx_id);
+    let (begin, rest) = bytes_ascii.split_at(16);
+    let (_rest, end) = rest.split_at(32);
+
+    ascii_bytes.append(begin);
+    ascii_bytes.append(end);
+
+    let small_txId: b256 = ascii_bytes.into();
+    small_txId
+}
+
+pub fn b256_to_ascii_bytes(val: b256) -> Bytes {
+    let bytes = Bytes::from(val);
+    let mut ascii_bytes = Bytes::with_capacity(64);
+    let mut idx = 0;
+
+    while idx < 32 {
+        let b = bytes.get(idx).unwrap();
+        ascii_bytes.push(ASCII_MAP[(b >> 4).as_u64()]);
+        ascii_bytes.push(ASCII_MAP[(b & 15).as_u64()]);
+	    idx = idx + 1;
+    }
+
+    ascii_bytes
+}
+
+configurable {
+    SIGNER: b256 = ZERO_B256,
+}
+
+fn main(witness_index: u64) -> bool {
+    let signature: B512 = tx_witness_data(witness_index);
+    let encoded = create_txid_small(tx_id());
+    let result = ed_verify(SIGNER, signature, encoded);
+
+    if result.is_ok() {
+        return true;
+    }
+
+    // Otherwise, an invalid signature has been passed and we invalidate the Tx.
+    false
+}