feat: Solana & Ethereum SDKs refactor

package.json

@@ -88,12 +88,14 @@
     "@commitlint/cli": "^13.1.0",
     "@commitlint/config-conventional": "^13.1.0",
     "@rarible/eslint-config-ts": "~0.5.0",
+    "@solana/web3.js": "~1.54.0",
     "eslint": "^7.32.0",
     "husky": "^7.0.4",
     "lerna": "^6.6.2",
     "lint-staged": "^10.4.0",
     "npm-check-updates": "^11.5.13",
     "npm-run-all": "^4.1.5",
+    "rxjs": "^6.6.7",
     "sort-package-json": "^1.52.0",
     "tslib": "^2.3.1",
     "typescript": "^4.8.4",

packages/connectors/connector-helper/package.json

@@ -20,18 +20,12 @@
     "@rarible/connector-beacon": "^0.13.68-fix.7",
     "@rarible/connector-fcl": "^0.13.68-fix.7",
     "@rarible/connector-mattel": "^0.13.68-fix.7",
-    "@rarible/estimate-middleware": "~0.9.6",
+    "@rarible/connector-solana": "^0.13.68-fix.7",
     "@rarible/sdk-common": "^0.13.68-fix.7",
     "@rarible/sdk-wallet": "^0.13.68-fix.7",
     "@rarible/tezos-sdk": "0.1.46",
     "@rarible/web3-ethereum": "^0.13.68-fix.7"
   },
-  "devDependencies": {
-    "@types/jest": "^27.0.2",
-    "identity-obj-proxy": "^3.0.0",
-    "jest": "^27.2.4",
-    "ts-jest": "^27.0.3"
-  },
   "peerDependencies": {
     "rxjs": ">= 6.6.7 < 8.0.0",
     "tslib": "^2.3.1"

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

@@ -1,24 +1,15 @@
 import type { AbstractConnectionProvider, ConnectionProvider } from "@rarible/connector"
 import { SolanaWallet } from "@rarible/sdk-wallet"
 import { Blockchain } from "@rarible/api-client"
-import type{ SolanaWalletProvider } from "@rarible/solana-wallet"
+import type { SolanaSigner } from "@rarible/solana-common"
 import type { IWalletAndAddress } from "./wallet-connection"
 
-export interface ISolanaProviderConnectionResult extends SolanaWalletProvider {
-	address: string
-}
-
 export function mapSolanaWallet<O>(
-	provider: AbstractConnectionProvider<O, ISolanaProviderConnectionResult>
+	provider: AbstractConnectionProvider<O, SolanaSigner>
 ): ConnectionProvider<O, IWalletAndAddress> {
-	return provider.map(state => ({
-		wallet: new SolanaWallet({
-			publicKey: state.publicKey!,
-			signTransaction: state.signTransaction,
-			signAllTransactions: state.signAllTransactions,
-			signMessage: state.signMessage,
-		}),
-		address: state.address,
+	return provider.map(signer => ({
+		wallet: new SolanaWallet(signer),
+		address: signer.publicKey.toString(),
 		blockchain: Blockchain.SOLANA,
 	}))
 }