Skip to content

Commit

Permalink
feat: get kernel client from nvmAccount
Browse files Browse the repository at this point in the history
  • Loading branch information
@eruizgar91
eruizgar91 committed Apr 23, 2024
1 parent 6aa65ac commit 8e1a40e
Show file tree
Hide file tree
Showing 6 changed files with 175 additions and 162 deletions.
285 changes: 149 additions & 136 deletions integration/external/Zerodev.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
// TODO: Enable when ZeroDev is ready
// import { verifyMessage } from '@ambire/signature-validator'
import { createEcdsaKernelAccountClient } from '@zerodev/presets/zerodev'
import { verifyMessage } from '@ambire/signature-validator'
import { KernelAccountClient } from '@zerodev/sdk'
import { assert } from 'chai'
// import { ethers } from 'ethers'
import { ethers } from 'ethers'
import * as fs from 'fs'
import { decodeJwt } from 'jose'
// import { createPublicClient, http } from 'viem'
import { createPublicClient, http } from 'viem'
import {
AssetAttributes,
AssetPrice,
Expand All @@ -19,132 +18,132 @@ import { config } from '../config'
import { getMetadata } from '../utils'
import { DDO } from '../../src/ddo'
import { ENTRYPOINT_ADDRESS_V07 } from 'permissionless'
import { getChain } from '../../src/utils/Network'
import { getKernelClient } from '../../src/nevermined/utils/BlockchainViemUtils'
import { arbitrumSepolia } from 'viem/chains'

describe('Nevermined sdk with zerodev', () => {
let nevermined: Nevermined
const PROJECT_ID = process.env.PROJECT_ID!
// const BUNDLER_RPC = `https://rpc.zerodev.app/api/v2/bundler/${PROJECT_ID}`
const BUNDLER_RPC = `https://rpc.zerodev.app/api/v2/bundler/${PROJECT_ID}`
// const PAYMASTER_RPC = `https://rpc.zerodev.app/api/v2/paymaster/${PROJECT_ID}`
// const entryPoint = ENTRYPOINT_ADDRESS_V07

// const publicClient = createPublicClient({
// chain: arbitrumSepolia,
// transport: http(BUNDLER_RPC),
// })
// const provider = new ethers.providers.JsonRpcProvider(config.web3ProviderUri)
const publicClient = createPublicClient({
chain: arbitrumSepolia,
transport: http(BUNDLER_RPC),
})
const provider = new ethers.providers.JsonRpcProvider(config.web3ProviderUri)
before(async () => {
nevermined = await Nevermined.getInstance(config)
})

// describe('Test zerodev signatures and login', () => {
// let kernelClient: KernelAccountClient<any, any, any>
// let clientAssertion: string

// before(async () => {
// const owner = makeRandomWallet()
// kernelClient = await createEcdsaKernelAccountClient({
// chain: arbitrumSepolia,
// projectId: PROJECT_ID,
// signer: owner,
// paymaster: 'SPONSOR',
// entryPointAddress: ENTRYPOINT_ADDRESS_V07,
// })
// })

// it('should produce a valid EIP-6492 signature', async () => {
// const signature = await kernelClient.signMessage({
// account: kernelClient.account,
// message: 'nevermined',
// })
// const isValidSignature = await verifyMessage({
// signer: kernelClient.account.address,
// signature: signature,
// message: 'nevermined',
// provider: provider,
// })
// assert.isTrue(isValidSignature)

// const signature2 = await kernelClient.account.signMessage({ message: 'nevermined' })
// const isValidSignature2 = await publicClient.verifyMessage({
// address: kernelClient.account.address,
// message: 'nevermined',
// signature: signature2,
// })
// assert.isTrue(isValidSignature2)
// })

// it('should provide a valid EIP-6492 typed signature', async () => {
// const domain = {
// name: 'Nevermined',
// version: '1',
// chainId: 80001,
// }
// const types = {
// Nevermined: [
// { name: 'from', type: 'address' },
// { name: 'message', type: 'string' },
// { name: 'token', type: 'string' },
// ],
// }
// const message = {
// from: kernelClient.account.address,
// message: 'nevermined',
// token: 'token',
// }

// const signature = await kernelClient.account.signTypedData({
// domain,
// types,
// message,
// primaryType: 'Nevermined',
// })

// // Currently using the method from the signature-validator package cause is the one that we use in the passport library

// // const isValidSignature = await publicClient.verifyTypedData({
// // address: kernelClient.account.address,
// // domain,
// // types,
// // primaryType: 'Nevermined',
// // message,
// // signature,
// // })

// const isValidSignature = await verifyMessage({
// signer: kernelClient.account.address,
// signature: signature,
// typedData: { types, domain, message },
// provider: provider,
// })

// assert.isTrue(isValidSignature)
// })

// it('should generate a client assertion with a zerodev signer', async () => {
// const account = await NvmAccount.fromZeroDevSigner(kernelClient.account)

// clientAssertion = await nevermined.utils.jwt.generateClientAssertion(account, 'hello world')
// assert.isDefined(clientAssertion)

// const jwtPayload = decodeJwt(clientAssertion)
// assert.equal(jwtPayload.iss, kernelClient.account.address)
// })

// it('should login to the marketplace api', async () => {
// const accessToken = await nevermined.services.marketplace.login(clientAssertion)
// assert.isDefined(accessToken)

// const jwtPayload = decodeJwt(accessToken)
// // const signer = zerodevProvider.getAccountSigner()
// assert.equal(jwtPayload.iss, kernelClient.account.address)
// assert.isDefined(jwtPayload.sub)
// })
// })
describe('Test zerodev signatures and login', () => {
let kernelClient: KernelAccountClient<any, any, any>
let clientAssertion: string

before(async () => {
const owner = makeRandomWallet()
kernelClient = await getKernelClient(
owner,
config.chainId as number,
ENTRYPOINT_ADDRESS_V07,
PROJECT_ID,
)
})

it('should produce a valid EIP-6492 signature', async () => {
const signature = await kernelClient.signMessage({
account: kernelClient.account,
message: 'nevermined',
})
const isValidSignature = await verifyMessage({
signer: kernelClient.account.address,
signature: signature,
message: 'nevermined',
provider: provider,
})
assert.isTrue(isValidSignature)

const signature2 = await kernelClient.account.signMessage({ message: 'nevermined' })
const isValidSignature2 = await publicClient.verifyMessage({
address: kernelClient.account.address,
message: 'nevermined',
signature: signature2,
})
assert.isTrue(isValidSignature2)
})

it('should provide a valid EIP-6492 typed signature', async () => {
const domain = {
name: 'Nevermined',
version: '1',
chainId: 80001,
}
const types = {
Nevermined: [
{ name: 'from', type: 'address' },
{ name: 'message', type: 'string' },
{ name: 'token', type: 'string' },
],
}
const message = {
from: kernelClient.account.address,
message: 'nevermined',
token: 'token',
}

const signature = await kernelClient.account.signTypedData({
domain,
types,
message,
primaryType: 'Nevermined',
})

// Currently using the method from the signature-validator package cause is the one that we use in the passport library

// const isValidSignature = await publicClient.verifyTypedData({
// address: kernelClient.account.address,
// domain,
// types,
// primaryType: 'Nevermined',
// message,
// signature,
// })

const isValidSignature = await verifyMessage({
signer: kernelClient.account.address,
signature: signature,
typedData: { types, domain, message },
provider: provider,
})

assert.isTrue(isValidSignature)
})

it('should generate a client assertion with a zerodev signer', async () => {
const account = await NvmAccount.fromZeroDevSigner(kernelClient)

clientAssertion = await nevermined.utils.jwt.generateClientAssertion(account, 'hello world')
assert.isDefined(clientAssertion)

const jwtPayload = decodeJwt(clientAssertion)
assert.equal(jwtPayload.iss, kernelClient.account.address)
})

it('should login to the marketplace api', async () => {
const accessToken = await nevermined.services.marketplace.login(clientAssertion)
assert.isDefined(accessToken)

const jwtPayload = decodeJwt(accessToken)
// const signer = zerodevProvider.getAccountSigner()
assert.equal(jwtPayload.iss, kernelClient.account.address)
assert.isDefined(jwtPayload.sub)
})
})

describe('E2E Asset flow with zerodev', () => {
let kernelClientPublisher: KernelAccountClient<any, any, any>
let kernelClientConsumer: KernelAccountClient<any, any, any>
let kernelClientPublisher: KernelAccountClient<any, any, any, any>
let kernelClientConsumer: KernelAccountClient<any, any, any, any>

let metadata: MetaData
let ddo: DDO
Expand All @@ -154,20 +153,34 @@ describe('Nevermined sdk with zerodev', () => {
const publisher = makeRandomWallet()
const consumer = makeRandomWallet()

kernelClientPublisher = await createEcdsaKernelAccountClient({
chain: getChain(config.chainId),
projectId: PROJECT_ID,
signer: publisher,
paymaster: 'SPONSOR',
entryPointAddress: ENTRYPOINT_ADDRESS_V07,
})
kernelClientConsumer = await createEcdsaKernelAccountClient({
chain: getChain(config.chainId),
projectId: PROJECT_ID,
signer: consumer,
paymaster: 'SPONSOR',
entryPointAddress: ENTRYPOINT_ADDRESS_V07,
})
// kernelClientPublisher = await createEcdsaKernelAccountClient({
// chain: getChain(config.chainId),
// projectId: PROJECT_ID,
// signer: publisher,
// paymaster: 'SPONSOR',
// entryPointAddress: ENTRYPOINT_ADDRESS_V07,
// })
// kernelClientConsumer = await createEcdsaKernelAccountClient({
// chain: getChain(config.chainId),
// projectId: PROJECT_ID,
// signer: consumer,
// paymaster: 'SPONSOR',
// entryPointAddress: ENTRYPOINT_ADDRESS_V07,
// })

kernelClientPublisher = await getKernelClient(
publisher,
config.chainId as number,
ENTRYPOINT_ADDRESS_V07,
PROJECT_ID,
)

kernelClientConsumer = await getKernelClient(
consumer,
config.chainId as number,
ENTRYPOINT_ADDRESS_V07,
PROJECT_ID,
)

// zerodevProviderPublisher = await ZeroDevEthersProvider.init('ECDSA', {
// projectId,
Expand All @@ -180,7 +193,7 @@ describe('Nevermined sdk with zerodev', () => {
// })

// const signerPublisher = kernelClientPublisher.getAccountSigner()
const accountPublisher = await NvmAccount.fromZeroDevSigner(kernelClientPublisher.account)
const accountPublisher = await NvmAccount.fromZeroDevSigner(kernelClientPublisher)
const clientAssertion = await nevermined.utils.jwt.generateClientAssertion(accountPublisher)

const accessToken = await nevermined.services.marketplace.login(clientAssertion)
Expand All @@ -203,7 +216,7 @@ describe('Nevermined sdk with zerodev', () => {
})

// const signerPublisher = kernelClientPublisher.getAccountSigner()
const publisher = await NvmAccount.fromZeroDevSigner(kernelClientPublisher.account)
const publisher = await NvmAccount.fromZeroDevSigner(kernelClientPublisher)
ddo = await nevermined.assets.create(assetAttributes, publisher)

assert.isDefined(ddo)
Expand All @@ -213,7 +226,7 @@ describe('Nevermined sdk with zerodev', () => {

it('owner should be able to download the asset', async () => {
// const signerPublisher = kernelClientPublisher.getAccountSigner()
const publisher = await NvmAccount.fromZeroDevSigner(kernelClientPublisher.account)
const publisher = await NvmAccount.fromZeroDevSigner(kernelClientPublisher)
const folder = '/tmp/nevermined/sdk-js'

const path = (await nevermined.assets.download(ddo.id, publisher, folder, -1)) as string
Expand All @@ -228,7 +241,7 @@ describe('Nevermined sdk with zerodev', () => {

it('consumer should be able to order the asset with a zerodev account', async () => {
// const signerConsumer = kernelClientConsumer.getAccountSigner()
const consumer = await NvmAccount.fromZeroDevSigner(kernelClientConsumer.account)
const consumer = await NvmAccount.fromZeroDevSigner(kernelClientConsumer)
agreementId = await nevermined.assets.order(ddo.id, 'access', consumer, {
// zeroDevSigner: signerConsumer,
})
Expand All @@ -238,7 +251,7 @@ describe('Nevermined sdk with zerodev', () => {

it('consumer should be able to access ordered assets with zerodev account', async () => {
// const signerConsumer = kernelClientConsumer.getAccountSigner()
const consumer = await NvmAccount.fromZeroDevSigner(kernelClientConsumer.account)
const consumer = await NvmAccount.fromZeroDevSigner(kernelClientConsumer)
const folder = '/tmp/nevermined/sdk-js'

const path = (await nevermined.assets.access(
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nevermined-io/sdk",
"version": "3.0.0-rc15",
"version": "3.0.0-rc16",
"description": "Javascript SDK for connecting with Nevermined Data Platform ",
"main": "./dist/node/sdk.js",
"typings": "./dist/node/sdk.d.ts",
Expand Down
Loading

0 comments on commit 8e1a40e

Please sign in to comment.