fix review 1

common/src/common/networks.ts

@@ -46,6 +46,7 @@ const networks = (() => {
   const getRpcUrl = (chainId: chainIdish): string => get(chainId)?.rpcUrls[0] || "";
 
   const has = (chainId: chainIdish): boolean => _networksMap?.has(Number(chainId));
+  const hasPaymaster = (chainId: chainIdish): boolean => get(chainId)?.paymaster || false;
 
   const isActive = (chainId: chainIdish): boolean => get(chainId)?.active || true;
   const isEip1559 = (chainId: chainIdish): boolean => Boolean(get(chainId)?.eip1559);
@@ -67,6 +68,7 @@ const networks = (() => {
 
   return {
     has,
+    hasPaymaster,
     get,
 
     getAllActive,

common/src/common/provider-get.ts

@@ -9,14 +9,13 @@ import { getChecksumAddress, sleep } from "../common/config";
 import { ethers } from "ethers";
 import { networks } from "./networks";
 import { receiveFunds } from "@kredeum/skale";
-import { Address } from "viem";
 
 let _providerSetting = false;
 
 // Cache providers per chainId
 const _providersPerChainId: Map<number, Provider> = new Map();
 
-const providerGetWindow = async (chainId = 0): Promise<Web3Provider | undefined> => {
+const providerGetWindow = async (chainId: number = 0): Promise<Web3Provider | undefined> => {
   const externalProvider = (window as WindowExternalProvider).ethereum || undefined;
   if (!externalProvider) return undefined;
 
@@ -36,7 +35,7 @@ const providerGetSigner = async (chainId = 0, accountOrIndex: string | number =
   if (!provider) return;
 
   const signer = provider.getSigner(accountOrIndex);
-  const signerAddress = (await signer.getAddress()) as Address;
+  const signerAddress = (await signer.getAddress());
 
   await receiveFunds(signerAddress, chainId);
 

common/src/common/types.ts

@@ -5,10 +5,10 @@ import { BigNumber } from "ethers";
 type _handleChainId = (chainId: string) => void;
 type _handleAccounts = (accounts: Array<string>) => void;
 type _onFunction = (label: string, func: _handleChainId | _handleAccounts) => void;
-type EthereumProvider = ExternalProvider & { on?: _onFunction };
+type EthereumProvider = ExternalProvider & { on?: _onFunction; };
 
-type WindowEthereumProvider = Window & typeof globalThis & { ethereum: EthereumProvider };
-type WindowExternalProvider = Window & typeof globalThis & { ethereum: ExternalProvider };
+type WindowEthereumProvider = Window & typeof globalThis & { ethereum: EthereumProvider; };
+type WindowExternalProvider = Window & typeof globalThis & { ethereum: ExternalProvider; };
 
 type AddressesType = {
   OpenNFTs: string;
@@ -28,19 +28,20 @@ type NetworkType = {
   chainLabel?: string;
   rpcUrls: Array<string>;
   iconUrls?: Array<string>;
-  nativeCurrency: { name: string; symbol: string; decimals: number };
+  nativeCurrency: { name: string; symbol: string; decimals: number; };
   blockExplorerUrls: Array<string>;
   etherscanApiKey?: string;
   hardhatOptions?: unknown;
-  subgraph?: { url?: string; startBlock?: number; active?: boolean };
-  infura?: { url?: string; active: boolean };
-  alchemy?: { url?: string; active: boolean };
-  covalent?: { active: boolean; url?: string; key?: string };
+  subgraph?: { url?: string; startBlock?: number; active?: boolean; };
+  infura?: { url?: string; active: boolean; };
+  alchemy?: { url?: string; active: boolean; };
+  covalent?: { active: boolean; url?: string; key?: string; };
   linkedLayer1?: number;
   linkedMainnet?: number;
   opstack?: boolean;
   active?: boolean;
   create?: boolean;
+  paymaster?: boolean;
   admin?: string;
   blur?: string;
   openSea?: string;
@@ -74,7 +75,7 @@ type CollectionType = {
   price?: BigNumber;
 };
 
-type CollectionFilterType = { owner?: string; tokenID?: string; offset?: number; limit?: number };
+type CollectionFilterType = { owner?: string; tokenID?: string; offset?: number; limit?: number; };
 
 ///////////////////////////////////////////////////
 // Exclusives storage parameters for Ipfs | Swarm
@@ -168,7 +169,7 @@ type Property = {
   display_value: string;
 };
 
-type Properties = { [k: string]: Property };
+type Properties = { [k: string]: Property; };
 
 type RefPageType = {
   chainId?: number;

config/src/mainnets.handlebars.json

@@ -429,7 +429,8 @@
       "https://honorable-steel-rasalhague.explorer.mainnet.skalenodes.com/"
     ],
     "active": false,
-    "create": true
+    "create": true,
+    "paymaster": true
   },
   {
     "chainId": 169,

config/src/testnets.handlebars.json

@@ -324,6 +324,7 @@
     ],
     "eip1559": false,
     "create": false,
+    "paymaster": true,
     "linkedMainnet": 1564830818
   },
   {

gulp/src/scss/_networks.scss

@@ -1 +1 @@
-$networks: "mainnet", "arbitrum", "optimism", "base", "linea", "mantle", "blast", "polygon-zkevm", "mode", "manta-pacific", "polygon", "gnosis", "avalanche", "fantom", "bsc", "scroll", "zora", "celo", "telos", "taiko", "skale", "skale-calypso", "local";
+$networks: "mainnet", "arbitrum", "optimism", "base", "linea", "mantle", "blast", "polygon-zkevm", "mode", "manta-pacific", "polygon", "gnosis", "avalanche", "fantom", "bsc", "scroll", "zora", "celo", "telos", "taiko", "skale-calypso", "local";

skale/src/skaleReceiveFunds.ts

@@ -59,7 +59,11 @@ const _functionSignatureGet = (chainId: number): Address => {
 const _rmBytesSymbol = (address: string) => address.replace(/^0x/, "");
 
 ////////////////////////////////////////////////
+<<<<<<< HEAD
 const receiveFunds = async (account: Address, chainId: number): Promise<TransactionReceipt | undefined> => {
+=======
+const receiveFunds = async (account: string, chainId: number): Promise<TransactionReceipt | undefined> => {
+>>>>>>> wip
   if (!isSkaleChain(chainId)) {
     console.info("@kredeum/Skale receiveFunds : ", "Not on a Skale chain, no sFuel to claim");
     return;
@@ -69,7 +73,7 @@ const receiveFunds = async (account: Address, chainId: number): Promise<Transact
   const chain = _getChainFromId(chainId);
   const publicClient: PublicClient = createPublicClient({ chain, transport: http() });
 
-  const receiverBalance = await publicClient.getBalance({ address: account });
+  const receiverBalance = await publicClient.getBalance({ address: account as Address });
   if (receiverBalance >= _faucetThresholdGet(chainId)) return;
 
   if (!_sessionPrivateKey) {

sveltekit/turbo.json

@@ -10,7 +10,7 @@
       "inputs": ["src/**", "../contracts/addresses.json"]
     },
     "build": {
-      "dependsOn": ["check", "@kredeum/gulp#build"],
+      "dependsOn": ["check", "@kredeum/gulp#build", "@kredeum/skale#build"],
       "inputs": ["src/**"],
       "outputs": ["web/dapp/index.html", "web/dapp/_app/**.*"]
     }