Merge branch 'feat/base-sepolia' of github.com:nevermined-io/sdk-js into feat/base-sepolia

Author: aaitor

integration/config.ts

@@ -73,6 +73,17 @@ if (process.env.NETWORK_NAME === 'base') {
   } as NeverminedOptions)
 }
 
+if (process.env.NETWORK_NAME === 'base-sepolia') {
+  Object.assign(configBase, {
+    chainId: 84532,
+    marketplaceUri: 'https://marketplace-api.base-sepolia.nevermined.app',
+    neverminedNodeUri: 'https://node.base-sepolia.nevermined.app',
+    web3ProviderUri: `https://base-sepolia.drpc.org`,
+    neverminedNodeAddress: '0x5838B5512cF9f12FE9f2beccB20eb47211F9B0bc',
+    graphHttpUri: undefined,
+  } as NeverminedOptions)
+}
+
 if (process.env.NETWORK_NAME === 'one-staging') {
   Object.assign(configBase, {
     chainId: 421614,

scripts/download-artifacts.sh

@@ -20,7 +20,7 @@ fi
 
 REPO_URL=https://artifacts.nevermined.network
 declare -A NETWORKS_MAP
-NETWORKS_MAP=( ["mainnet"]="1" ["rinkeby"]="4" ["optimism"]="10" ["kovan"]="42" ["gnosis"]="100" ["matic"]="137" ["peaq"]="3338" ["base"]="8453" ["mumbai"]="80001" ["celo-alfajores"]="44787" ["celo"]="42220" ["aurora"]="1313161554" ["aurora-testnet"]="1313161555" ["arbitrum-one"]="42161" ["arbitrum-goerli"]="421613" ["arbitrum-sepolia"]="421614" )
+NETWORKS_MAP=( ["mainnet"]="1" ["rinkeby"]="4" ["optimism"]="10" ["kovan"]="42" ["gnosis"]="100" ["matic"]="137" ["peaq"]="3338" ["base"]="8453" ["base-sepolia"]="84532" ["mumbai"]="80001" ["celo-alfajores"]="44787" ["celo"]="42220" ["aurora"]="1313161554" ["aurora-testnet"]="1313161555" ["arbitrum-one"]="42161" ["arbitrum-goerli"]="421613" ["arbitrum-sepolia"]="421614" )
 
 SCRIPT_DIR=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
 UNPACK_DIR="$SCRIPT_DIR/../artifacts"

src/events/ContractEvent.ts

@@ -82,7 +82,8 @@ export class ContractEvent extends NeverminedEvent {
         chainId === 3338 ||
         chainId === 8453 ||
         chainId === 42220 ||
-        chainId === 80001
+        chainId === 80001 ||
+        chainId === 84532
       ) {
         const latestBlock = await this.client.public.getBlockNumber()
         options.fromBlock = latestBlock - 999n

src/nevermined/utils/BlockchainViemUtils.ts

@@ -533,7 +533,12 @@ export const formatEther = (value: bigint): string => {
  * @param zeroDevProjectId the zero dev project id, you can get it from the ZeroDev dashboard
  * @returns the kernel client
  */
-export async function createKernelClient(signer: any, chainId: number, zeroDevProjectId: string) {
+export async function createKernelClient(
+  signer: any,
+  chainId: number,
+  zeroDevProjectId: string,
+  provider?: string,
+) {
   const publicClient = createPublicClient({
     chain: getChain(chainId),
     transport: http(),
@@ -556,13 +561,17 @@ export async function createKernelClient(signer: any, chainId: number, zeroDevPr
   return createKernelAccountClient({
     account,
     chain: getChain(chainId),
-    bundlerTransport: http(`https://rpc.zerodev.app/api/v2/bundler/${zeroDevProjectId}`),
+    bundlerTransport: http(
+      `https://rpc.zerodev.app/api/v2/bundler/${zeroDevProjectId}?provider=${provider}`,
+    ),
     client: publicClient,
     paymaster: {
       getPaymasterData: (userOperation) => {
         const zerodevPaymaster = createZeroDevPaymasterClient({
           chain: getChain(chainId),
-          transport: http(`https://rpc.zerodev.app/api/v2/paymaster/${zeroDevProjectId}`),
+          transport: http(
+            `https://rpc.zerodev.app/api/v2/paymaster/${zeroDevProjectId}?provider=${provider}`,
+          ),
         })
         return zerodevPaymaster.sponsorUserOperation({
           userOperation,

src/utils/Network.ts

@@ -49,6 +49,8 @@ export async function getNetworkName(networkId: number): Promise<string> {
       return 'peaq-mainnet'
     case 8453:
       return 'base'
+    case 84532:
+      return 'base-sepolia'
     case 10200:
       return 'chiado' // Gnosis testnet
     case 31337:
@@ -117,6 +119,8 @@ export function isTestnet(networkId: number): boolean {
       return false
     case 8453:
       return false
+    case 84532:
+      return true
     case 10200:
       return true
     case 31337:

test/config.ts

@@ -57,23 +57,11 @@ if (process.env.NETWORK_NAME === 'geth-localnet') {
   } as NeverminedOptions
 } else if (process.env.NETWORK_NAME === 'gnosis') {
   config = {
-    chainId: 100,
-    marketplaceUri: 'https://marketplace-api.gnosis.nevermined.app',
-    neverminedNodeUri: 'https://node.gnosis.nevermined.app',
-    neverminedNodeAddress: '0x824dbcE5E9C96C5b8ce2A35a25a5ab87eD1D00b1',
-    web3ProviderUri: `https://rpc.gnosischain.com/`,
-    graphHttpUri: undefined,
-    // verbose: LogLevel.Verbose,
-    artifactsFolder: './artifacts',
-    circuitsFolder: './circuits',
-  } as NeverminedOptions
-} else if (process.env.NETWORK_NAME === 'base') {
-  config = {
-    chainId: 8453,
-    marketplaceUri: 'https://marketplace-api.base.nevermined.app',
-    neverminedNodeUri: 'https://node.base.nevermined.app',
-    neverminedNodeAddress: '0x824dbcE5E9C96C5b8ce2A35a25a5ab87eD1D00b1',
-    web3ProviderUri: `https://1rpc.io/base`,
+    chainId: 84532,
+    marketplaceUri: 'https://marketplace-api.base-sepolia.nevermined.app',
+    neverminedNodeUri: 'https://node.base-sepolia.nevermined.app',
+    neverminedNodeAddress: '0x5838B5512cF9f12FE9f2beccB20eb47211F9B0bc',
+    web3ProviderUri: `https://base-sepolia.drpc.org`,
     graphHttpUri: undefined,
     // verbose: LogLevel.Verbose,
     artifactsFolder: './artifacts',