@nevermined-io/core-kit 0.0.2-rc19 → 0.0.2-rc25

package/dist/contracts/AssetRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AssetRegistry.d.ts","sourceRoot":"","sources":["../../src/contracts/AssetRegistry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AssetRegistry.d.ts","sourceRoot":"","sources":["../../src/contracts/AssetRegistry.ts"],"names":[],"mappings":"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"}

package/dist/contracts/AssetRegistry.js

@@ -29,7 +29,8 @@ export class AssetRegistry extends ContractBase {
     async createPlan({ priceConfig, creditsConfig, owner, nonce = 0n, addFees = true, isTrialPlan = false, txParams, }) {
         const _config = await this.planConfigPreFilter(priceConfig, creditsConfig, addFees);
         if (isTrialPlan) {
-            return this.send('createPlanWithHooks', owner, [_config.priceConfig, _config.creditsConfig, [oneTimeCreatorHookAddress], nonce], txParams);
+            const hooks = [oneTimeCreatorHookAddress];
+            return this.send('createPlanWithHooks', owner, [_config.priceConfig, _config.creditsConfig, hooks, nonce], txParams);
         }
         else {
             return this.send('createPlan', owner, [_config.priceConfig, _config.creditsConfig, nonce], txParams);

package/dist/contracts/ContractBase.d.ts

@@ -2,6 +2,12 @@ import { Abi, Account, Address, TransactionReceipt } from 'viem';
 import { SmartAccount, UserOperationReceipt } from 'viem/account-abstraction';
 import { Instantiable, InstantiableConfig } from '../Instantiable.abstract.js';
 import { TxParameters } from '../models/Transactions.js';
+export interface MulticallEntry {
+    contractAddress: Address;
+    abi: Abi;
+    functionName: string;
+    args: any[];
+}
 export declare abstract class ContractBase extends Instantiable {
     readonly contractName: string;
     contract: any;
@@ -14,8 +20,11 @@ export declare abstract class ContractBase extends Instantiable {
     call<T>(functionName: string, args: any[], from?: string): Promise<T>;
     getTransactionReceipt(txHash: UserOperationReceipt | TransactionReceipt): Promise<TransactionReceipt>;
     getTransactionLogs(txReceipt: TransactionReceipt | UserOperationReceipt, eventName?: string): any[];
+    multicall(calls: MulticallEntry[], from: Account | SmartAccount, params?: TxParameters): Promise<TransactionReceipt | undefined>;
     send(functionName: string, from: Account | SmartAccount, args: any[], params?: TxParameters): Promise<TransactionReceipt | UserOperationReceipt>;
+    private internalMulticallSmartAccount;
     private internalSendSmartAccount;
     private localAccountSend;
+    private localAccountMulticall;
 }
 //# sourceMappingURL=ContractBase.d.ts.map

package/dist/contracts/ContractBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContractBase.d.ts","sourceRoot":"","sources":["../../src/contracts/ContractBase.ts"],"names":[],"mappings":"AACA,OAAO,EACL,GAAG,EACH,OAAO,EACP,OAAO,EAQP,kBAAkB,EACnB,MAAM,MAAM,CAAA;AACb,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AAE7E,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AASxD,8BAAsB,YAAa,SAAQ,YAAY;IACrD,SAAgB,YAAY,EAAE,MAAM,CAAA;IAC7B,QAAQ,EAAE,GAAG,CAAA;IACb,OAAO,EAAE,OAAO,CAAA;gBAEX,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;cAMlC,IAAI,CAClB,MAAM,EAAE,kBAAkB,EAC1B,cAAc,EAAE;QAAE,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,GAAG,EAAE,GAAG,CAAA;KAAE;IAYzC,IAAI,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAiBrE,qBAAqB,CAChC,MAAM,EAAE,oBAAoB,GAAG,kBAAkB,GAChD,OAAO,CAAC,kBAAkB,CAAC;IAgBvB,kBAAkB,CACvB,SAAS,EAAE,kBAAkB,GAAG,oBAAoB,EACpD,SAAS,CAAC,EAAE,MAAM,GAOZ,GAAG,EAAE;IAGA,IAAI,CACf,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,GAAG,YAAY,EAC5B,IAAI,EAAE,GAAG,EAAE,EACX,MAAM,GAAE,YAAiB,GACxB,OAAO,CAAC,kBAAkB,GAAG,oBAAoB,CAAC;YAiBvC,wBAAwB;YA8HxB,gBAAgB;CAiG/B"}
+{"version":3,"file":"ContractBase.d.ts","sourceRoot":"","sources":["../../src/contracts/ContractBase.ts"],"names":[],"mappings":"AACA,OAAO,EACL,GAAG,EACH,OAAO,EACP,OAAO,EAQP,kBAAkB,EACnB,MAAM,MAAM,CAAA;AACb,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AAE7E,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAIxD,MAAM,WAAW,cAAc;IAC7B,eAAe,EAAE,OAAO,CAAA;IACxB,GAAG,EAAE,GAAG,CAAA;IACR,YAAY,EAAE,MAAM,CAAA;IACpB,IAAI,EAAE,GAAG,EAAE,CAAA;CACZ;AAED,8BAAsB,YAAa,SAAQ,YAAY;IACrD,SAAgB,YAAY,EAAE,MAAM,CAAA;IAC7B,QAAQ,EAAE,GAAG,CAAA;IACb,OAAO,EAAE,OAAO,CAAA;gBAEX,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;cAMlC,IAAI,CAClB,MAAM,EAAE,kBAAkB,EAC1B,cAAc,EAAE;QAAE,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,GAAG,EAAE,GAAG,CAAA;KAAE;IAYzC,IAAI,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAiBrE,qBAAqB,CAChC,MAAM,EAAE,oBAAoB,GAAG,kBAAkB,GAChD,OAAO,CAAC,kBAAkB,CAAC;IAgBvB,kBAAkB,CACvB,SAAS,EAAE,kBAAkB,GAAG,oBAAoB,EACpD,SAAS,CAAC,EAAE,MAAM,GAOZ,GAAG,EAAE;IAGA,SAAS,CACpB,KAAK,EAAE,cAAc,EAAE,EACvB,IAAI,EAAE,OAAO,GAAG,YAAY,EAC5B,MAAM,GAAE,YAAiB;IAgBd,IAAI,CACf,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,GAAG,YAAY,EAC5B,IAAI,EAAE,GAAG,EAAE,EACX,MAAM,GAAE,YAAiB,GACxB,OAAO,CAAC,kBAAkB,GAAG,oBAAoB,CAAC;YAiBvC,6BAA6B;YA+E7B,wBAAwB;YA8HxB,gBAAgB;YAkGhB,qBAAqB;CAepC"}

package/dist/contracts/ContractBase.js

@@ -2,8 +2,7 @@ import { createKernelAccountClient, createZeroDevPaymasterClient } from '@zerode
 import { BaseError, ContractFunctionRevertedError, encodeFunctionData, getContract, http, parseAbi, parseEventLogs, } from 'viem';
 import { ContractsError } from '../errors/index.js';
 import { Instantiable } from '../Instantiable.abstract.js';
-import { getInputsOfFunctionFormatted, getSignatureOfFunction, getTransactionReceipt, } from '../nevermined/index.js';
-import { jsonReplacer } from '../utils/helpers.js';
+import { getInputsOfFunctionFormatted, getTransactionReceipt } from '../nevermined/index.js';
 import { getChain } from '../utils/Network.js';
 export class ContractBase extends Instantiable {
     contractName;
@@ -63,6 +62,23 @@ export class ContractBase extends Instantiable {
             strict: false,
         });
     }
+    async multicall(calls, from, params = {}) {
+        if (from.type === 'local') {
+            this.logger.debug(`Blockchain Multicall using Local account`);
+            return await this.localAccountMulticall(calls, from, params, params.progress);
+        }
+        else if (from.type === 'json-rpc') {
+            this.logger.debug(`Blockchain Multicall using JSON-RPC account`);
+            return await this.localAccountMulticall(calls, from, params, params.progress);
+        }
+        else if (from.type === 'smart') {
+            this.logger.debug(`Blockchain Multicall using ZeroDev account`);
+            return await this.internalMulticallSmartAccount(calls, from, params, params.progress);
+        }
+        else {
+            throw new ContractsError(`Account not supported`);
+        }
+    }
     async send(functionName, from, args, params = {}) {
         if (from.type === 'local') {
             this.logger.debug(`Blockchain Send using Local account with functionName: ${functionName} and following args: ${args}`);
@@ -80,6 +96,73 @@ export class ContractBase extends Instantiable {
             throw new ContractsError(`Account not supported`);
         }
     }
+    async internalMulticallSmartAccount(calls, from, txparams, progress) {
+        if (progress) {
+            progress({
+                stage: 'multicall-sending',
+                args: [],
+                method: '',
+                from: from,
+                contractAddress: this.address,
+            });
+        }
+        const ZERODEV_RPC = `https://rpc.zerodev.app/api/v3/${this.config.zeroDevProjectId}/chain/${this.config.chainId}`;
+        const zerodevPaymaster = createZeroDevPaymasterClient({
+            chain: getChain(this.config.chainId),
+            transport: http(ZERODEV_RPC),
+        });
+        const kernelClient = createKernelAccountClient({
+            account: from,
+            chain: getChain(this.config.chainId),
+            bundlerTransport: http(ZERODEV_RPC),
+            client: this.contract.publicClient,
+            paymaster: {
+                getPaymasterData: (userOperation) => {
+                    return zerodevPaymaster.sponsorUserOperation({
+                        userOperation,
+                    });
+                },
+            },
+        });
+        const encodedCalls = [];
+        calls.map((call) => {
+            encodedCalls.push({
+                to: call.contractAddress || this.address,
+                value: txparams.value || 0n,
+                data: encodeFunctionData({
+                    abi: call.abi,
+                    functionName: call.functionName,
+                    args: call.args,
+                }),
+            });
+        });
+        try {
+            const userOpHash = await kernelClient.sendUserOperation({
+                callData: await kernelClient.account.encodeCalls(encodedCalls),
+            });
+            if (progress) {
+                progress({
+                    stage: 'multicall-sent',
+                    args: [],
+                    method: '',
+                    from: from,
+                    contractAddress: this.address,
+                });
+            }
+            // Wait for the transaction to be mined
+            this.logger.debug(`Waiting for transaction to be mined...`, userOpHash);
+            const txReceipt = await kernelClient.waitForUserOperationReceipt({ hash: userOpHash });
+            this.logger.debug(`Transaction mined: ${userOpHash}`);
+            return txReceipt.receipt;
+        }
+        catch (err) {
+            if (err instanceof BaseError) {
+                const revertError = err.walk((err) => err instanceof ContractFunctionRevertedError);
+                this.logger.error('revertError', revertError);
+            }
+            throw new ContractsError(`Multicall failed: ${err}`);
+        }
+    }
     async internalSendSmartAccount(name, from, args, txparams, progress) {
         const functionInputs = getInputsOfFunctionFormatted(this.contract.abi, name, args);
         const { gasLimit, value } = txparams;
@@ -186,13 +269,13 @@ export class ContractBase extends Instantiable {
     async localAccountSend(name, from, args, txparams, progress) {
         const functionInputs = getInputsOfFunctionFormatted(this.contract.abi, name, args);
         // Uncomment to debug contract calls
-        if (name === 'createAgreement') {
-            const functionSignature = getSignatureOfFunction(this.contract.abi, name, args);
-            console.debug(`Making contract call ....: ${name} - ${from}`);
-            console.debug(`With args`, args);
-            console.debug(`And signature - ${JSON.stringify(functionSignature, jsonReplacer)}`);
-            console.debug('And amount: ', txparams.value);
-        }
+        // if (name === 'createAgreement') {
+        //   const functionSignature = getSignatureOfFunction(this.contract.abi, name, args)
+        //   this.logger.debug(`Making contract call ....: ${name} - ${from}`)
+        //   this.logger.debug(`With args`, args)
+        //   this.logger.debug(`And signature - ${JSON.stringify(functionSignature, jsonReplacer)}`)
+        //   this.logger.debug('And amount: ', txparams.value)
+        // }
         //  abi.filter(({name, inputs}) => name === 'closeSignals' && inputs.length === 1)
         // const abiFilter = this.contract.abi.filter((abi) => abi.name === name && abi.inputs.length === args.length)
         // const abiFilter = this.contract.abi.filter((abi) => abi.name === name && abi.type === 'function')
@@ -267,4 +350,14 @@ export class ContractBase extends Instantiable {
         }
         return txReceipt;
     }
+    async localAccountMulticall(calls, from, txparams, progress) {
+        const receipts = [];
+        for (const call of calls) {
+            receipts.push(await this.localAccountSend(call.functionName, from, call.args, txparams, progress));
+        }
+        if (receipts.length > 0)
+            return receipts.pop();
+        else
+            throw new ContractsError(`No receipts found for multicall`);
+    }
 }

package/dist/contracts/FixedPaymentTemplate.d.ts

@@ -1,10 +1,13 @@
-import { Account } from 'viem';
+import { Account, Address } from 'viem';
 import { SmartAccount } from 'viem/account-abstraction';
 import { InstantiableConfig } from '../Instantiable.abstract.js';
 import { TxParameters } from '../models/Transactions.js';
 import { ContractBase } from './ContractBase.js';
 export declare class FixedPaymentTemplate extends ContractBase {
+    private TOKEN_APPROVE_ABI;
     static getInstance(config: InstantiableConfig): Promise<FixedPaymentTemplate>;
     createAgreement(planId: bigint, owner: Account | SmartAccount, txParams?: TxParameters): Promise<import("viem").TransactionReceipt | import("viem/account-abstraction").UserOperationReceipt>;
+    approveERC20(totalAmount: bigint, tokenAddress: Address, owner: Account | SmartAccount, txParams?: TxParameters): Promise<import("viem").TransactionReceipt | undefined>;
+    createAgreementWithApprovals(planId: bigint, totalAmount: bigint, tokenAddress: Address, owner: Account | SmartAccount, txParams?: TxParameters): Promise<import("viem").TransactionReceipt | undefined>;
 }
 //# sourceMappingURL=FixedPaymentTemplate.d.ts.map

package/dist/contracts/FixedPaymentTemplate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FixedPaymentTemplate.d.ts","sourceRoot":"","sources":["../../src/contracts/FixedPaymentTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAEvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,qBAAa,oBAAqB,SAAQ,YAAY;WACvB,WAAW,CACtC,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,oBAAoB,CAAC;IASnB,eAAe,CAC1B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,OAAO,GAAG,YAAY,EAC7B,QAAQ,CAAC,EAAE,YAAY;CAK1B"}
+{"version":3,"file":"FixedPaymentTemplate.d.ts","sourceRoot":"","sources":["../../src/contracts/FixedPaymentTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,OAAO,EAAE,OAAO,EAAY,MAAM,MAAM,CAAA;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAMvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,OAAO,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAA;AAEhE,qBAAa,oBAAqB,SAAQ,YAAY;IACpD,OAAO,CAAC,iBAAiB,CAEhB;WAEoB,WAAW,CACtC,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,oBAAoB,CAAC;IASnB,eAAe,CAC1B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,OAAO,GAAG,YAAY,EAC7B,QAAQ,CAAC,EAAE,YAAY;IAMZ,YAAY,CACvB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,OAAO,EACrB,KAAK,EAAE,OAAO,GAAG,YAAY,EAC7B,QAAQ,CAAC,EAAE,YAAY;IAmBZ,4BAA4B,CACvC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,OAAO,EACrB,KAAK,EAAE,OAAO,GAAG,YAAY,EAC7B,QAAQ,CAAC,EAAE,YAAY;CA0B1B"}

package/dist/contracts/FixedPaymentTemplate.js

@@ -1,7 +1,11 @@
-import { fixedPaymentTemplateConfig } from '../artifacts/generated.js';
+import { parseAbi } from 'viem';
+import { fixedPaymentTemplateConfig, lockPaymentConditionAddress, paymentsVaultAddress, } from '../artifacts/generated.js';
 import { generateZeroXId } from '../utils/helpers.js';
 import { ContractBase } from './ContractBase.js';
 export class FixedPaymentTemplate extends ContractBase {
+    TOKEN_APPROVE_ABI = parseAbi([
+        'function approve(address spender, uint256 amount) external returns (bool)',
+    ]);
     static async getInstance(config) {
         const fixedPaymentTemplate = new FixedPaymentTemplate('FixedPaymentTemplate', fixedPaymentTemplateConfig.address);
         await fixedPaymentTemplate.init(config, fixedPaymentTemplateConfig);
@@ -11,4 +15,45 @@ export class FixedPaymentTemplate extends ContractBase {
         const agreementIdSeed = generateZeroXId();
         return this.send('createAgreement', owner, [agreementIdSeed, planId, []], txParams);
     }
+    async approveERC20(totalAmount, tokenAddress, owner, txParams) {
+        const calls = [
+            {
+                contractAddress: tokenAddress,
+                abi: this.TOKEN_APPROVE_ABI,
+                functionName: 'approve',
+                args: [lockPaymentConditionAddress, totalAmount],
+            },
+            {
+                contractAddress: tokenAddress,
+                abi: this.TOKEN_APPROVE_ABI,
+                functionName: 'approve',
+                args: [paymentsVaultAddress, totalAmount],
+            },
+        ];
+        return await this.multicall(calls, owner, txParams);
+    }
+    async createAgreementWithApprovals(planId, totalAmount, tokenAddress, owner, txParams) {
+        const agreementIdSeed = generateZeroXId();
+        const calls = [
+            {
+                contractAddress: tokenAddress,
+                abi: this.TOKEN_APPROVE_ABI,
+                functionName: 'approve',
+                args: [lockPaymentConditionAddress, totalAmount],
+            },
+            {
+                contractAddress: tokenAddress,
+                abi: this.TOKEN_APPROVE_ABI,
+                functionName: 'approve',
+                args: [paymentsVaultAddress, totalAmount],
+            },
+            {
+                contractAddress: this.address,
+                abi: this.contract.abi,
+                functionName: 'createAgreement',
+                args: [agreementIdSeed, planId, []],
+            },
+        ];
+        return await this.multicall(calls, owner, txParams);
+    }
 }

package/dist/models/AgentAccessToken.d.ts

@@ -0,0 +1,123 @@
+import { JWTPayload } from 'jose';
+import { Account } from 'viem';
+import { SmartAccount } from 'viem/account-abstraction';
+import { SignatureUtils } from '../nevermined/utils/SignatureUtils.js';
+/**
+ * The access to remote agents is granted through an authorization token.
+ * This token is generated using the AgentAccessToken JWT structure.
+ * AgentAccessToken:
+ *   authToken: JWTAuthTokenParams
+ *   proof: JWTRedemptionProofParams
+ */
+export interface JWTAuthTokenParams {
+    /**
+     * The agent identifier related with the authorization token.
+     */
+    agentId: string;
+    /**
+     * The plan identifier related with the authorization token.
+     */
+    planId: string;
+    /**
+     * The public address of the account the key is issued for.
+     */
+    sub: `0x${string}`;
+    /**
+     * The public address of the account issuing the key.
+     */
+    iss?: `0x${string}`;
+    /**
+     * The chain id of the network the token is valid for. If zero the key is not having any network limitation
+     */
+    aud?: string;
+    /**
+     * JWT Expiration Time
+     *
+     * @see {@link https://www.rfc-editor.org/rfc/rfc7519#section-4.1.4 RFC7519#section-4.1.4}
+     */
+    exp?: number;
+    /**
+     * JWT Issued At
+     *
+     * @see {@link https://www.rfc-editor.org/rfc/rfc7519#section-4.1.6 RFC7519#section-4.1.6}
+     */
+    iat?: number;
+    [key: string]: unknown;
+}
+export interface JWTRedemptionProofParams {
+    keyspace: string;
+    nonce: string;
+    planIds: string[];
+}
+export declare class AgentAccessToken implements JWTPayload {
+    /**
+     * The version of the access token
+     */
+    ver?: string;
+    /**
+     * The authorization token used to query the agent.
+     * This token is validated by the agent or proxy to ensure the request is authorized
+     * {@see {@link AgentAuthTokenParams}}
+     */
+    authToken?: string;
+    /**
+     * The proof generated by the subscriber (sub) to prove the request to query the agent
+     * {@see {@link JWTRedemptionProofParams}
+     */
+    proof?: string;
+    iss?: string | undefined;
+    sub?: string | undefined;
+    aud?: string | string[] | undefined;
+    exp?: number;
+    iat?: number;
+    [propName: string]: unknown;
+    _signatureUtils: SignatureUtils;
+    _issuerAccount: Account | SmartAccount;
+    private constructor();
+    /**
+     * It generates a new serialized and encrypted NvmApiKey including the ZeroDev session key and the Marketplace auth token.
+     * The string  representing this key can be used to authenticate against the Nevermined API.
+     * @param signatureUtils The SignatureUtils instance
+     * @param issuerAccount The account issuing the key
+    
+     */
+    static generate(signatureUtils: SignatureUtils, issuerAccount: Account | SmartAccount, agentId: string, planId: string | bigint, subscriberAddress: `0x${string}`, expirationTime?: number | string, version?: string): Promise<AgentAccessToken>;
+    setRedemptionProof(keyspace: string, nonce: string): Promise<this>;
+    decodeAuthToken(): JWTAuthTokenParams;
+    /**
+     * It serializes the NVM Api Key into a string
+     * @returns a string representing the NVM API Key
+     */
+    serialize(): string;
+    /**
+     * It serializes the NVM Api Key into a string
+     * @returns a string representing the NVM API Key
+     */
+    toString(): string;
+    /**
+     * It generates a signed JWT from the NvmApiKey
+     * @param signatureUtils The SignatureUtils instance
+     * @param issuerAccount The account issuing the key
+     * @returns the string in JWT format represeting the NvmApiKey
+     */
+    toJWT(): Promise<string>;
+    static fromJWT(jwtString: string, signatureUtils: SignatureUtils, issuerAddress: Account | SmartAccount): AgentAccessToken;
+    /**
+     * It decodes a string JWT into a JWTPayload
+     * @param str jwt string
+     * @returns the JWTPayload
+     */
+    static decodeJWT(str: string): JWTPayload;
+    /**
+     * It generates the hash of the NvmApiKey
+     * @returns a string representing the hash of the NvmApiKey
+     */
+    hash(): string;
+    /**
+     * Given a serialized string, it generates the hash
+     * @param serialized the serialized string
+     * @returns the hash
+     */
+    static hash(serialized: string): string;
+}
+//# sourceMappingURL=AgentAccessToken.d.ts.map

package/dist/models/AgentAccessToken.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AgentAccessToken.d.ts","sourceRoot":"","sources":["../../src/models/AgentAccessToken.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAa,MAAM,MAAM,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AAEtE;;;;;;GAMG;AAEH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,OAAO,EAAE,MAAM,CAAA;IACf;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;IACd;;OAEG;IACH,GAAG,EAAE,KAAK,MAAM,EAAE,CAAA;IAClB;;OAEG;IACH,GAAG,CAAC,EAAE,KAAK,MAAM,EAAE,CAAA;IACnB;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB;AAED,qBAAa,gBAAiB,YAAW,UAAU;IACjD;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAElB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACxB,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACxB,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAA;IACnC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IAE3B,eAAe,EAAE,cAAc,CAAA;IAC/B,cAAc,EAAE,OAAO,GAAG,YAAY,CAAA;IAEtC,OAAO;IAMP;;;;;;OAMG;WACiB,QAAQ,CAC1B,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,OAAO,GAAG,YAAY,EACrC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,iBAAiB,EAAE,KAAK,MAAM,EAAE,EAChC,cAAc,GAAE,MAAM,GAAG,MAAa,EACtC,OAAO,SAAM,GACZ,OAAO,CAAC,gBAAgB,CAAC;IA8Bf,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAWxD,eAAe,IAAI,kBAAkB;IAiB5C;;;OAGG;IACI,SAAS,IAAI,MAAM;IAI1B;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAUzB;;;;;OAKG;IACU,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;WAYvB,OAAO,CACnB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,OAAO,GAAG,YAAY,GACpC,gBAAgB;IAWnB;;;;OAIG;WACW,SAAS,CAAC,GAAG,EAAE,MAAM;IAInC;;;OAGG;IACI,IAAI;IAIX;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM;CAG/B"}

package/dist/models/AgentAccessToken.js

@@ -0,0 +1,164 @@
+import { decodeJwt } from 'jose';
+import { getChecksumAddress } from '../nevermined/utils/BlockchainViemUtils.js';
+import { EthSignJWT } from '../nevermined/utils/JwtUtils.js';
+import { SignatureUtils } from '../nevermined/utils/SignatureUtils.js';
+export class AgentAccessToken {
+    /**
+     * The version of the access token
+     */
+    ver;
+    /**
+     * The authorization token used to query the agent.
+     * This token is validated by the agent or proxy to ensure the request is authorized
+     * {@see {@link AgentAuthTokenParams}}
+     */
+    authToken;
+    /**
+     * The proof generated by the subscriber (sub) to prove the request to query the agent
+     * {@see {@link JWTRedemptionProofParams}
+     */
+    proof;
+    iss;
+    sub;
+    aud;
+    exp;
+    iat;
+    _signatureUtils;
+    _issuerAccount;
+    constructor(signatureUtils, issuerAccount) {
+        this.ver = '1';
+        this._signatureUtils = signatureUtils;
+        this._issuerAccount = issuerAccount;
+    }
+    /**
+     * It generates a new serialized and encrypted NvmApiKey including the ZeroDev session key and the Marketplace auth token.
+     * The string  representing this key can be used to authenticate against the Nevermined API.
+     * @param signatureUtils The SignatureUtils instance
+     * @param issuerAccount The account issuing the key
+    
+     */
+    static async generate(signatureUtils, issuerAccount, agentId, planId, subscriberAddress, expirationTime = '1y', version = '1') {
+        const issuerAddress = getChecksumAddress(issuerAccount.address);
+        const chainId = signatureUtils.client.chain?.id || 0;
+        const sub = getChecksumAddress(subscriberAddress);
+        const jwtAuth = {
+            iss: issuerAddress,
+            aud: chainId.toString(),
+            sub,
+            agentId,
+            planId: typeof planId === 'bigint' ? planId.toString() : planId,
+        };
+        const signedJWTAuth = await new EthSignJWT(jwtAuth)
+            .setProtectedHeader({ alg: 'ES256K' })
+            .setIssuedAt()
+            .setExpirationTime(expirationTime)
+            .ethSign(signatureUtils, issuerAccount);
+        // const jwtAccessToken: JWTAgentAccessToken = {
+        //   ver: version,
+        //   authToken: signedJWTAuth,
+        //   proof: undefined, // This can be set later when the proof is generated
+        // }
+        const agentAccessToken = new AgentAccessToken(signatureUtils, issuerAccount);
+        agentAccessToken.ver = version;
+        agentAccessToken.authToken = signedJWTAuth;
+        agentAccessToken.proof = undefined; // This can be set later when the proof is generated
+        return agentAccessToken;
+    }
+    async setRedemptionProof(keyspace, nonce) {
+        const jwtPayload = decodeJwt(this.authToken);
+        const proofParams = {
+            keyspace,
+            nonce,
+            planIds: [String(jwtPayload.planId)],
+        };
+        this.proof = JSON.stringify(proofParams);
+        return this;
+    }
+    decodeAuthToken() {
+        if (!this.authToken) {
+            throw new Error('Auth token is not set');
+        }
+        const jwt = decodeJwt(this.authToken);
+        return {
+            agentId: jwt.agentId,
+            planId: jwt.planId,
+            sub: jwt.sub,
+            iss: jwt.iss,
+            aud: jwt.aud,
+            exp: jwt.exp,
+            iat: jwt.iat,
+        };
+    }
+    /**
+     * It serializes the NVM Api Key into a string
+     * @returns a string representing the NVM API Key
+     */
+    serialize() {
+        return this.toString();
+    }
+    /**
+     * It serializes the NVM Api Key into a string
+     * @returns a string representing the NVM API Key
+     */
+    toString() {
+        const params = {};
+        Object.keys(this)
+            .filter((val) => val !== undefined)
+            .forEach((key) => {
+            if (!key.startsWith('_'))
+                params[key] = this[key];
+        });
+        return JSON.stringify(params);
+    }
+    /**
+     * It generates a signed JWT from the NvmApiKey
+     * @param signatureUtils The SignatureUtils instance
+     * @param issuerAccount The account issuing the key
+     * @returns the string in JWT format represeting the NvmApiKey
+     */
+    async toJWT() {
+        const params = {};
+        Object.keys(this)
+            .filter((val) => val !== undefined)
+            .forEach((key) => {
+            if (!key.startsWith('_'))
+                params[key] = this[key];
+        });
+        const jwt = new EthSignJWT(params).setProtectedHeader({ alg: 'ES256K' });
+        return jwt.ethSign(this._signatureUtils, this._issuerAccount);
+    }
+    static fromJWT(jwtString, signatureUtils, issuerAddress) {
+        const jwt = AgentAccessToken.decodeJWT(jwtString);
+        const agentAccessToken = new AgentAccessToken(signatureUtils, issuerAddress);
+        Object.keys(jwt)
+            .filter((val) => val !== undefined)
+            .forEach((key) => {
+            if (!key.startsWith('_'))
+                agentAccessToken[key] = jwt[key];
+        });
+        return agentAccessToken;
+    }
+    /**
+     * It decodes a string JWT into a JWTPayload
+     * @param str jwt string
+     * @returns the JWTPayload
+     */
+    static decodeJWT(str) {
+        return decodeJwt(str);
+    }
+    /**
+     * It generates the hash of the NvmApiKey
+     * @returns a string representing the hash of the NvmApiKey
+     */
+    hash() {
+        return SignatureUtils.hash(this.serialize());
+    }
+    /**
+     * Given a serialized string, it generates the hash
+     * @param serialized the serialized string
+     * @returns the hash
+     */
+    static hash(serialized) {
+        return SignatureUtils.hash(serialized);
+    }
+}

package/dist/models/NeverminedOptions.d.ts

@@ -12,20 +12,11 @@ export declare class NeverminedOptions {
      */
     appUrl?: string;
     backendUrl?: string;
-    /**
-     * Web3 Provider.
-     */
+    agentsProxy?: string;
     /**
      * Log level.
      */
     logLevel: string;
-    /**
-     * Gas multiplier for the fees.
-     * Can be used to speed up the transactions.
-     */
-    /**
-     * Enpoint for the graph-node http query
-     */
     /**
      * The folder where the nevermined contract artifacts are located.
      */
@@ -39,10 +30,6 @@ export declare class NeverminedOptions {
     ipfsGateway?: string;
     ipfsProjectId?: string;
     ipfsProjectSecret?: string;
-    /**
-     * Use a gas station to calculate transaction fees
-     */
-    gasStationUri?: string;
     /**
      * ZeroDev project id
      */

package/dist/models/NeverminedOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NeverminedOptions.d.ts","sourceRoot":"","sources":["../../src/models/NeverminedOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAE9B,qBAAa,iBAAiB;IACrB,OAAO,EAAE,MAAM,CAAA;IACtB;;;;OAIG;IACI,eAAe,CAAC,EAAE,MAAM,CAAA;IAE/B;;OAEG;IACI,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf,UAAU,CAAC,EAAE,MAAM,CAAA;IAI1B;;OAEG;IAGH;;OAEG;IACI,QAAQ,SAAS;IAGxB;;;OAGG;IAGH;;OAEG;IAGH;;OAEG;IACI,eAAe,CAAC,EAAE,MAAM,CAAA;IAExB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAA;IAE3B;;;;OAIG;IACI,WAAW,CAAC,EAAE,MAAM,CAAoB;IAExC,aAAa,CAAC,EAAE,MAAM,CAAA;IAEtB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAEjC;;OAEG;IACI,aAAa,CAAC,EAAE,MAAM,CAAA;IAE7B;;OAEG;IACI,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAEhC;;OAEG;IACI,gBAAgB,CAAC,EAAE,MAAM,CAAA;CACjC"}
+{"version":3,"file":"NeverminedOptions.d.ts","sourceRoot":"","sources":["../../src/models/NeverminedOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAE9B,qBAAa,iBAAiB;IACrB,OAAO,EAAE,MAAM,CAAA;IACtB;;;;OAIG;IACI,eAAe,CAAC,EAAE,MAAM,CAAA;IAE/B;;OAEG;IACI,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB,WAAW,CAAC,EAAE,MAAM,CAAA;IAE3B;;OAEG;IACI,QAAQ,SAAS;IAExB;;OAEG;IACI,eAAe,CAAC,EAAE,MAAM,CAAA;IAExB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAA;IAE3B;;;;OAIG;IACI,WAAW,CAAC,EAAE,MAAM,CAAoB;IAExC,aAAa,CAAC,EAAE,MAAM,CAAA;IAEtB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAEjC;;OAEG;IACI,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAEhC;;OAEG;IACI,gBAAgB,CAAC,EAAE,MAAM,CAAA;CACjC"}

package/dist/models/NeverminedOptions.js

@@ -11,25 +11,11 @@ export class NeverminedOptions {
      */
     appUrl;
     backendUrl;
-    // public backendAuthToken?: string
-    /**
-     * Web3 Provider.
-     */
-    // public web3Provider?: any
+    agentsProxy;
     /**
      * Log level.
      */
     logLevel = 'info';
-    // public verbose?: boolean | LogLevel
-    /**
-     * Gas multiplier for the fees.
-     * Can be used to speed up the transactions.
-     */
-    // public gasMultiplier?: number
-    /**
-     * Enpoint for the graph-node http query
-     */
-    // public graphHttpUri?: string
     /**
      * The folder where the nevermined contract artifacts are located.
      */
@@ -43,10 +29,6 @@ export class NeverminedOptions {
     ipfsGateway = 'https://ipfs.io';
     ipfsProjectId;
     ipfsProjectSecret;
-    /**
-     * Use a gas station to calculate transaction fees
-     */
-    gasStationUri;
     /**
      * ZeroDev project id
      */

package/dist/models/index.d.ts

@@ -2,4 +2,5 @@ export * from './Logger.js';
 export * from './NeverminedOptions.js';
 export * from './NvmApiKey.js';
 export * from './Transactions.js';
+export * from './AgentAccessToken.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/models/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/models/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,wBAAwB,CAAA;AACtC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/models/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,wBAAwB,CAAA;AACtC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,mBAAmB,CAAA;AACjC,cAAc,uBAAuB,CAAA"}

package/dist/models/index.js

@@ -2,3 +2,4 @@ export * from './Logger.js';
 export * from './NeverminedOptions.js';
 export * from './NvmApiKey.js';
 export * from './Transactions.js';
+export * from './AgentAccessToken.js';

package/dist/nevermined/api/PaymentsApi.d.ts

@@ -9,7 +9,6 @@ export declare class PaymentsApi extends Instantiable {
      * @returns {@link PaymentsApi}
      */
     constructor(config: InstantiableConfig);
-    private getTokenContract;
     getERC20Balance(userAddress: Address, tokenAddress: Address): Promise<bigint>;
     orderFiatPayment(planId: bigint, planReceiver: Address, from: Account | SmartAccount): Promise<OrderResult>;
     orderCryptoPayment(planId: bigint, plan: Plan, from: Account | SmartAccount): Promise<OrderResult>;

package/dist/nevermined/api/PaymentsApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PaymentsApi.d.ts","sourceRoot":"","sources":["../../../src/nevermined/api/PaymentsApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,OAAO,EAAE,OAAO,EAAsC,MAAM,MAAM,CAAA;AAChF,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AAEjF,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAEvD,OAAO,EAAE,WAAW,EAAE,IAAI,EAA8B,MAAM,uBAAuB,CAAA;AAQrF,qBAAa,WAAY,SAAQ,YAAY;IAC3C;;;;OAIG;gBACS,MAAM,EAAE,kBAAkB;YAKxB,gBAAgB;IAsBjB,eAAe,CAAC,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAgB7E,gBAAgB,CAC3B,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,GAAG,YAAY,GAC3B,OAAO,CAAC,WAAW,CAAC;IAqBV,kBAAkB,CAC7B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,OAAO,GAAG,YAAY,GAC3B,OAAO,CAAC,WAAW,CAAC;CA8ExB"}
+{"version":3,"file":"PaymentsApi.d.ts","sourceRoot":"","sources":["../../../src/nevermined/api/PaymentsApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAyB,MAAM,MAAM,CAAA;AAC9D,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,IAAI,EAA8B,MAAM,uBAAuB,CAAA;AAKrF,qBAAa,WAAY,SAAQ,YAAY;IAC3C;;;;OAIG;gBACS,MAAM,EAAE,kBAAkB;IAKzB,eAAe,CAAC,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAgB7E,gBAAgB,CAC3B,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,GAAG,YAAY,GAC3B,OAAO,CAAC,WAAW,CAAC;IAqBV,kBAAkB,CAC7B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,OAAO,GAAG,YAAY,GAC3B,OAAO,CAAC,WAAW,CAAC;CAmFxB"}

package/dist/nevermined/api/PaymentsApi.js

@@ -1,11 +1,7 @@
-import { getContract, parseAbi, zeroAddress } from 'viem';
+import { parseAbi, zeroAddress } from 'viem';
 import { Instantiable } from '../../Instantiable.abstract.js';
-import { lockPaymentConditionAddress } from '../../artifacts/generated.js';
-import { createKernelClient } from '../utils/BlockchainViemUtils.js';
 import { PlanTransactionPaymentType } from '@nvm-monorepo/commons';
-const TOKEN_APPROVE_ABI = parseAbi([
-    'function approve(address spender, uint256 amount) external returns (bool)',
-]);
+import { NotEnoughBalance } from '../../errors/NeverminedErrors.js';
 const TOKEN_BALANCE_ABI = parseAbi(['function balanceOf(address) view returns (uint256)']);
 export class PaymentsApi extends Instantiable {
     /**
@@ -17,23 +13,6 @@ export class PaymentsApi extends Instantiable {
         super();
         this.setInstanceConfig(config);
     }
-    async getTokenContract(token, from) {
-        if (from.type === 'smart') {
-            const kernelClient = await createKernelClient(from, this.config.chainId, this.config.zeroDevProjectId, this.nevermined.contracts.assetRegistry.publicClient);
-            return getContract({
-                address: token,
-                abi: TOKEN_APPROVE_ABI,
-                client: kernelClient,
-            });
-        }
-        else {
-            return getContract({
-                address: token,
-                abi: TOKEN_APPROVE_ABI,
-                client: this.walletClient,
-            });
-        }
-    }
     async getERC20Balance(userAddress, tokenAddress) {
         try {
             return this.client.public.readContract({
@@ -69,20 +48,23 @@ export class PaymentsApi extends Instantiable {
             const tokenAddress = plan.price.tokenAddress;
             const totalAmount = plan.price.amounts.reduce((a, b) => a + b, 0n);
             this.logger.debug(`Ordering ${tokenAddress} ${totalAmount}`);
+            let txHash;
             if (tokenAddress && tokenAddress !== zeroAddress) {
+                this.logger.debug(`Processing ERC20 payment...`);
                 // ERC20 token payment
                 if (totalAmount > 0n) {
                     const erc20Balance = await this.getERC20Balance(from.address, tokenAddress);
+                    this.logger.debug(`ERC20 balance for ${from.address} in ${tokenAddress}: balance = ${erc20Balance} - total amount = ${totalAmount}`);
                     if (erc20Balance < totalAmount) {
-                        throw new Error(`Insufficient balance (${erc20Balance} < ${totalAmount}) for ERC20 ${tokenAddress}`);
+                        throw new NotEnoughBalance(`Insufficient balance (${erc20Balance} < ${totalAmount}) for ERC20 ${tokenAddress}`);
                     }
-                    const tokenContract = await this.getTokenContract(tokenAddress, from);
-                    // Approve lockPayment contract
-                    const hash = await tokenContract.write.approve([lockPaymentConditionAddress, totalAmount]);
-                    const receipt = await this.nevermined.contracts.fixedPaymentTemplate.publicClient.waitForTransactionReceipt({ hash });
-                    this.logger.debug('Approving token transfer to lockPayment contract', receipt);
+                    txHash =
+                        await this.nevermined.contracts.fixedPaymentTemplate.createAgreementWithApprovals(planId, totalAmount, tokenAddress, from);
+                    this.logger.debug(`Token approved + Agreement Created: ${txHash}`);
+                }
+                else {
+                    txHash = await this.nevermined.contracts.fixedPaymentTemplate.createAgreement(planId, from);
                 }
-                const txHash = await this.nevermined.contracts.fixedPaymentTemplate.createAgreement(planId, from);
                 const txReceipt = await this.nevermined.contracts.assetRegistry.getTransactionReceipt(txHash);
                 return {
                     txHash: txReceipt.transactionHash,
@@ -99,9 +81,9 @@ export class PaymentsApi extends Instantiable {
                 // Native token payment
                 const nativeTokenBalance = await this.client.public.getBalance({ address: from.address });
                 if (nativeTokenBalance < totalAmount) {
-                    throw new Error(`Insufficient balance (${nativeTokenBalance} < ${totalAmount}) for native token payment`);
+                    throw new NotEnoughBalance(`Insufficient balance (${nativeTokenBalance} < ${totalAmount}) for native token payment`);
                 }
-                const txHash = await this.nevermined.contracts.fixedPaymentTemplate.createAgreement(planId, from, {
+                txHash = await this.nevermined.contracts.fixedPaymentTemplate.createAgreement(planId, from, {
                     value: totalAmount,
                 });
                 const txReceipt = await this.nevermined.contracts.assetRegistry.getTransactionReceipt(txHash);

package/dist/nevermined/utils/AgentUtils.d.ts

@@ -0,0 +1,8 @@
+import { ApiEndpoint } from '@nvm-monorepo/commons';
+export declare function isEndpointRequestedIncluded(requestEndpoint: string, requestedHTTPVerb: string, agentEndpoints: ApiEndpoint[], agentOpenEndpoints?: string[]): {
+    matches: boolean;
+    urlMatching?: URL;
+    verbMatching?: string;
+};
+export declare function areUrlsEqualIgnoringQuery(url1: URL, url2: URL): boolean;
+//# sourceMappingURL=AgentUtils.d.ts.map

package/dist/nevermined/utils/AgentUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AgentUtils.d.ts","sourceRoot":"","sources":["../../../src/nevermined/utils/AgentUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAGnD,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,iBAAiB,EAAE,MAAM,EACzB,cAAc,EAAE,WAAW,EAAE,EAC7B,kBAAkB,GAAE,MAAM,EAAO,GAChC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,GAAG,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CAoChE;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAOvE"}

package/dist/nevermined/utils/AgentUtils.js

@@ -0,0 +1,42 @@
+import { match } from 'path-to-regexp';
+export function isEndpointRequestedIncluded(requestEndpoint, requestedHTTPVerb, agentEndpoints, agentOpenEndpoints = []) {
+    try {
+        let matches = false;
+        requestedHTTPVerb = requestedHTTPVerb.toLowerCase();
+        let urlMatching, verbMatching;
+        const requestedUrl = new URL(requestEndpoint);
+        // Is the endpoint an open endpoint?
+        agentOpenEndpoints.forEach((openEndpoint) => {
+            const agentUrl = new URL(openEndpoint);
+            if (areUrlsEqualIgnoringQuery(agentUrl, requestedUrl)) {
+                urlMatching = new URL(openEndpoint);
+                matches = true;
+            }
+        });
+        if (matches)
+            return { matches: true, urlMatching };
+        // check if the endpoint/verb is part of the list
+        agentEndpoints.forEach((ep) => {
+            const [verb, url] = Object.entries(ep)[0];
+            const _url = new URL(url);
+            const fn = match(_url.pathname, { decode: decodeURIComponent });
+            if (fn(requestedUrl.pathname) && (verb.toLowerCase() === requestedHTTPVerb || verb === '*')) {
+                matches = true;
+                urlMatching = _url;
+                verbMatching = verb;
+                return;
+            }
+        });
+        return { matches, urlMatching, verbMatching };
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    }
+    catch (error) {
+        return { matches: false };
+    }
+}
+export function areUrlsEqualIgnoringQuery(url1, url2) {
+    return (url1.protocol === url2.protocol &&
+        url1.hostname === url2.hostname &&
+        url1.port === url2.port &&
+        url1.pathname === url2.pathname);
+}

package/dist/nevermined/utils/BlockchainViemUtils.d.ts

@@ -66,8 +66,8 @@ export declare function getContractInstance(contractAddress: string, abi: Abi, c
     };
     getEvents: {
         [x: string]: (...parameters: [options?: {
-            strict?: boolean | undefined;
             blockHash?: `0x${string}` | undefined;
+            strict?: boolean | undefined;
             fromBlock?: bigint | import("viem").BlockTag | undefined;
             toBlock?: bigint | import("viem").BlockTag | undefined;
         } | undefined] | [args?: readonly unknown[] | {
@@ -84,8 +84,8 @@ export declare function getContractInstance(contractAddress: string, abi: Abi, c
             batch?: undefined;
             pollingInterval?: undefined;
         } | undefined, options?: {
-            strict?: boolean | undefined;
             blockHash?: `0x${string}` | undefined;
+            strict?: boolean | undefined;
             fromBlock?: bigint | import("viem").BlockTag | undefined;
             toBlock?: bigint | import("viem").BlockTag | undefined;
         } | undefined]) => Promise<import("viem").GetContractEventsReturnType<Abi, string>>;

package/dist/nevermined/utils/JwtUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"JwtUtils.d.ts","sourceRoot":"","sources":["../../../src/nevermined/utils/JwtUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAEvD,OAAO,EAAE,KAAK,mBAAmB,EAAE,OAAO,EAAwB,MAAM,MAAM,CAAA;AAC9E,OAAO,EAAE,KAAK,OAAO,EAAmD,MAAM,MAAM,CAAA;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AAGjF,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEpD,qBAAa,UAAW,SAAQ,OAAO;IACrC,eAAe,EAAE,mBAAmB,GAAG,SAAS,CAAA;IAEvC,kBAAkB,CAAC,eAAe,EAAE,mBAAmB;IAKnD,OAAO,CAClB,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,OAAO,GAAG,YAAY,EAC/B,UAAU,CAAC,EAAE,UAAU,GACtB,OAAO,CAAC,MAAM,CAAC;WAoDE,QAAQ,CAC1B,IAAI,EAAE,MAAM,GAAG,UAAU,EACzB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAY9B,OAAO,CAAC,SAAS;IAKjB,OAAO,CAAC,MAAM;CAUf;AAED,qBAAa,QAAS,SAAQ,YAAY;IACxC,MAAM,CAAC,qBAAqB,SAA2D;IAGvF,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,cAAc,EAAE,cAAc,CAAA;gBAElB,MAAM,EAAE,kBAAkB;IAO/B,gBAAgB,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM;IAIrC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC;IAqB3D,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,EAAE,OAAO,CAAC,EAAE,MAAM;IAmB/E,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAc3C,MAAM,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM;IAKxC,MAAM,CAAC,aAAa,CAAC,aAAa,EAAE,MAAM;CAK3C"}
+{"version":3,"file":"JwtUtils.d.ts","sourceRoot":"","sources":["../../../src/nevermined/utils/JwtUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAEvD,OAAO,EAAE,KAAK,mBAAmB,EAAE,OAAO,EAAwB,MAAM,MAAM,CAAA;AAC9E,OAAO,EAAE,KAAK,OAAO,EAA4D,MAAM,MAAM,CAAA;AAC7F,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AAGjF,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAGpD,qBAAa,UAAW,SAAQ,OAAO;IACrC,eAAe,EAAE,mBAAmB,GAAG,SAAS,CAAA;IAEvC,kBAAkB,CAAC,eAAe,EAAE,mBAAmB;IAKnD,OAAO,CAClB,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,OAAO,GAAG,YAAY,EAC/B,UAAU,CAAC,EAAE,UAAU,GACtB,OAAO,CAAC,MAAM,CAAC;WAoDE,QAAQ,CAC1B,IAAI,EAAE,MAAM,GAAG,UAAU,EACzB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAY9B,OAAO,CAAC,SAAS;IAKjB,OAAO,CAAC,MAAM;CAUf;AAED,qBAAa,QAAS,SAAQ,YAAY;IACxC,MAAM,CAAC,qBAAqB,SAA2D;IAGvF,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,cAAc,EAAE,cAAc,CAAA;gBAElB,MAAM,EAAE,kBAAkB;IAO/B,gBAAgB,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM;IAIrC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC;IAqB3D,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,EAAE,OAAO,CAAC,EAAE,MAAM;IAyB/E,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAc3C,MAAM,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM;IAKxC,MAAM,CAAC,aAAa,CAAC,aAAa,EAAE,MAAM;CAK3C"}

package/dist/nevermined/utils/JwtUtils.js

@@ -5,6 +5,7 @@ import { Instantiable } from '../../Instantiable.abstract.js';
 import { urlSafeBase64Decode, urlSafeBase64Encode } from '../../utils/helpers.js';
 import { getChecksumAddress } from './BlockchainViemUtils.js';
 import { SignatureUtils } from './SignatureUtils.js';
+import { NVM_INFRA_ADMIN_ROLE } from '../../contracts/Roles.js';
 export class EthSignJWT extends SignJWT {
     protectedHeader;
     setProtectedHeader(protectedHeader) {
@@ -122,8 +123,10 @@ export class JwtUtils extends Instantiable {
             };
         }
         const address = getChecksumAddress(account.address);
+        const isAdmin = await this.nevermined.contracts.accessManager.hasRole(NVM_INFRA_ADMIN_ROLE, address);
         return new EthSignJWT({
             iss: address,
+            roles: isAdmin[0] ? ['admin'] : [],
         })
             .setProtectedHeader({ alg: 'ES256K' })
             .setIssuedAt()

package/dist/nevermined/utils/WebServiceConnector.d.ts

@@ -23,7 +23,7 @@ export declare class WebServiceConnector {
     downloadUrl(url: string, headers?: any): Promise<string>;
     uploadMessage(url: string, data: string, encrypt?: boolean): Promise<any>;
     uploadFile(url: string, data: ReadStream, encrypt?: boolean): Promise<any>;
-    fetchToken(url: string, grantToken: string, numberTries?: number, apiKeyHash?: string): Promise<Response>;
+    fetchToken(url: string, grantToken: string, sessionKey?: string, numberTries?: number, apiKeyHash?: string): Promise<Response>;
     fetchCID(cid: string): Promise<string>;
     private static getIPFSAuthToken;
     private fetch;

package/dist/nevermined/utils/WebServiceConnector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebServiceConnector.d.ts","sourceRoot":"","sources":["../../../src/nevermined/utils/WebServiceConnector.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAe,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE5D,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAA;AAC/B,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAEhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AAgBnE;;GAEG;AACH,qBAAa,mBAAmB;IAG9B,MAAM,EAAE,kBAAkB,CAAA;gBAEd,MAAM,EAAE,kBAAkB;IAM/B,IAAI,CACT,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,OAAO,GAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,GACzC,OAAO,CAAC,QAAQ,CAAC;IAWb,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,EAAE,OAAO,GAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IASrF,GAAG,CACR,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,OAAO,GAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,GACzC,OAAO,CAAC,QAAQ,CAAC;IAWb,MAAM,CACX,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,QAAQ,EAClB,OAAO,GAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,GACzC,OAAO,CAAC,QAAQ,CAAC;IAgEP,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAQxD,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IASzE,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAS1E,UAAU,CACrB,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,WAAW,SAAI,EACf,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,QAAQ,CAAC;IAuBP,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAoBnD,OAAO,CAAC,MAAM,CAAC,gBAAgB;YAUjB,KAAK;IAiBnB,OAAO,CAAC,MAAM;CAGf"}
+{"version":3,"file":"WebServiceConnector.d.ts","sourceRoot":"","sources":["../../../src/nevermined/utils/WebServiceConnector.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAe,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE5D,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAA;AAC/B,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAEhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AAgBnE;;GAEG;AACH,qBAAa,mBAAmB;IAG9B,MAAM,EAAE,kBAAkB,CAAA;gBAEd,MAAM,EAAE,kBAAkB;IAM/B,IAAI,CACT,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,OAAO,GAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,GACzC,OAAO,CAAC,QAAQ,CAAC;IAWb,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,EAAE,OAAO,GAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IASrF,GAAG,CACR,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,OAAO,GAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,GACzC,OAAO,CAAC,QAAQ,CAAC;IAWb,MAAM,CACX,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,QAAQ,EAClB,OAAO,GAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,GACzC,OAAO,CAAC,QAAQ,CAAC;IAgEP,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAQxD,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IASzE,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAS1E,UAAU,CACrB,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,SAAI,EACf,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,QAAQ,CAAC;IA2BP,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAoBnD,OAAO,CAAC,MAAM,CAAC,gBAAgB;YAUjB,KAAK;IAiBnB,OAAO,CAAC,MAAM;CAGf"}

package/dist/nevermined/utils/WebServiceConnector.js

@@ -133,11 +133,14 @@ export class WebServiceConnector {
         }
         return this.fetch(url, { method: 'POST', body: form });
     }
-    async fetchToken(url, grantToken, numberTries = 1, apiKeyHash) {
+    async fetchToken(url, grantToken, sessionKey, numberTries = 1, apiKeyHash) {
         const bodyParams = new URLSearchParams({
             client_assertion_type: JwtUtils.CLIENT_ASSERTION_TYPE,
             client_assertion: grantToken,
         });
+        if (sessionKey) {
+            bodyParams.append('sessionKey', sessionKey);
+        }
         if (apiKeyHash) {
             bodyParams.append('nvm_key_hash', apiKeyHash);
         }

package/dist/nevermined/utils/ZeroDevPolicies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ZeroDevPolicies.d.ts","sourceRoot":"","sources":["../../../src/nevermined/utils/ZeroDevPolicies.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,GAAG,EAAY,MAAM,MAAM,CAAA;AAEpC,wBAAgB,SAAS,CAAC,WAAW,EAAE,GAAG,EAAE,yCAK3C;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,EAAE,SAelE;AAED,wBAAgB,0BAA0B,CAAC,eAAe,EAAE,KAAK,MAAM,EAAE;;SAK/D,GAAG;;EAGZ;AACD,eAAO,MAAM,qBAAqB,GAAI,iBAAiB,KAAK,MAAM,EAAE,0CACV,CAAA;AAE1D,eAAO,MAAM,0BAA0B,6CACwB,CAAA;AAE/D,eAAO,MAAM,gCAAgC,6CACoB,CAAA;AAEjE,eAAO,MAAM,uBAAuB,6CACuC,CAAA;AAE3E,eAAO,MAAM,cAAc,6CACiD,CAAA;AAE5E,eAAO,MAAM,gBAAgB,6CAAkE,CAAA;AAE/F,eAAO,MAAM,gBAAgB,6CAAkE,CAAA;AAE/F,eAAO,MAAM,iBAAiB,6CAS3B,CAAA;AAEH,eAAO,MAAM,WAAW,GAAI,aAAa,MAAM,EAAE,EAAE,iBAAiB,KAAK,MAAM,EAAE,0CAoBhF,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,iBAAiB,KAAK,MAAM,EAAE,0CAcjE,CAAA"}
+{"version":3,"file":"ZeroDevPolicies.d.ts","sourceRoot":"","sources":["../../../src/nevermined/utils/ZeroDevPolicies.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,GAAG,EAAY,MAAM,MAAM,CAAA;AAEpC,wBAAgB,SAAS,CAAC,WAAW,EAAE,GAAG,EAAE,yCAK3C;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,EAAE,SAelE;AAED,wBAAgB,0BAA0B,CAAC,eAAe,EAAE,KAAK,MAAM,EAAE;;SAK/D,GAAG;;EAGZ;AACD,eAAO,MAAM,qBAAqB,GAAI,iBAAiB,KAAK,MAAM,EAAE,0CACV,CAAA;AAE1D,eAAO,MAAM,0BAA0B,6CACwB,CAAA;AAE/D,eAAO,MAAM,gCAAgC,6CAC2C,CAAA;AAExF,eAAO,MAAM,uBAAuB,6CACuC,CAAA;AAE3E,eAAO,MAAM,cAAc,6CACiD,CAAA;AAE5E,eAAO,MAAM,gBAAgB,6CAAkE,CAAA;AAE/F,eAAO,MAAM,gBAAgB,6CAAkE,CAAA;AAE/F,eAAO,MAAM,iBAAiB,6CAU3B,CAAA;AAEH,eAAO,MAAM,WAAW,GAAI,aAAa,MAAM,EAAE,EAAE,iBAAiB,KAAK,MAAM,EAAE,0CAqBhF,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,iBAAiB,KAAK,MAAM,EAAE,0CAejE,CAAA"}

package/dist/nevermined/utils/ZeroDevPolicies.js

@@ -32,7 +32,7 @@ export function getERC20ApprovePermissions(contractAddress) {
 }
 export const getERC20ApprovePolicy = (contractAddress) => getPolicy([getERC20ApprovePermissions(contractAddress)]);
 export const getAgentRegistrationPolicy = () => getPolicy(getPermissions(assetsRegistryConfig, ['register']));
-export const getPricingPlanRegistrationPolicy = () => getPolicy(getPermissions(assetsRegistryConfig, ['createPlan']));
+export const getPricingPlanRegistrationPolicy = () => getPolicy(getPermissions(assetsRegistryConfig, ['createPlan', 'createPlanWithHooks']));
 export const getRegisterAssetsPolicy = () => getPolicy(getPermissions(assetsRegistryConfig, ['registerAssetAndPlan']));
 export const getOrderPolicy = () => getPolicy(getPermissions(fixedPaymentTemplateConfig, ['createAgreement']));
 export const getMintNFTPolicy = () => getPolicy(getPermissions(nft1155CreditsConfig, ['mint']));
@@ -40,6 +40,7 @@ export const getBurnNFTPolicy = () => getPolicy(getPermissions(nft1155CreditsCon
 export const getRegisterPolicy = () => getPolicy(getPermissions(assetsRegistryConfig, [
     'register',
     'createPlan',
+    'createPlanWithHooks',
     'registerAssetAndPlan',
     'addPlanToAsset',
     'removePlanFromAsset',
@@ -50,6 +51,7 @@ export const buildPolicy = (permissions, contractAddress) => {
             ? getPermissions(assetsRegistryConfig, [
                 'register',
                 'createPlan',
+                'createPlanWithHooks',
                 'registerAssetAndPlan',
                 'addPlanToAsset',
                 'removePlanFromAsset',
@@ -68,6 +70,7 @@ export const getAllContractsPolicy = (contractAddress) => getPolicy([
     ...getPermissions(assetsRegistryConfig, [
         'register',
         'createPlan',
+        'createPlanWithHooks',
         'registerAssetAndPlan',
         'addPlanToAsset',
         'removePlanFromAsset',

package/dist/nevermined/utils/index.d.ts

@@ -3,4 +3,5 @@ export * from './JwtUtils.js';
 export * from './SignatureUtils.js';
 export * from './WebServiceConnector.js';
 export * from './ZeroDevPolicies.js';
+export * from './AgentUtils.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/nevermined/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/nevermined/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,eAAe,CAAA;AAC7B,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA;AACxC,cAAc,sBAAsB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/nevermined/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,eAAe,CAAA;AAC7B,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA;AACxC,cAAc,sBAAsB,CAAA;AACpC,cAAc,iBAAiB,CAAA"}

package/dist/nevermined/utils/index.js

@@ -3,3 +3,4 @@ export * from './JwtUtils.js';
 export * from './SignatureUtils.js';
 export * from './WebServiceConnector.js';
 export * from './ZeroDevPolicies.js';
+export * from './AgentUtils.js';

package/dist/services/Api.d.ts

@@ -2,6 +2,6 @@ import { Instantiable, InstantiableConfig } from '../Instantiable.abstract.js';
 export declare class Api extends Instantiable {
     constructor(config: InstantiableConfig);
     protected get url(): string | undefined;
-    validateAssertion(clientAssertion: string): Promise<string>;
+    validateAssertion(clientAssertion: string, sessionKey?: string): Promise<string>;
 }
 //# sourceMappingURL=Api.d.ts.map

package/dist/services/Api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Api.d.ts","sourceRoot":"","sources":["../../src/services/Api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAK9E,qBAAa,GAAI,SAAQ,YAAY;gBACvB,MAAM,EAAE,kBAAkB;IAKtC,SAAS,KAAK,GAAG,uBAEhB;IAEY,iBAAiB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAkBzE"}
+{"version":3,"file":"Api.d.ts","sourceRoot":"","sources":["../../src/services/Api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAK9E,qBAAa,GAAI,SAAQ,YAAY;gBACvB,MAAM,EAAE,kBAAkB;IAKtC,SAAS,KAAK,GAAG,uBAEhB;IAEY,iBAAiB,CAAC,eAAe,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAmB9F"}

package/dist/services/Api.js

@@ -9,13 +9,13 @@ export class Api extends Instantiable {
     get url() {
         return this.config.backendUrl;
     }
-    async validateAssertion(clientAssertion) {
+    async validateAssertion(clientAssertion, sessionKey) {
         try {
-            const response = await this.nevermined.utils.fetch.fetchToken(`${this.url}${authPath}/validate-assertion`, clientAssertion);
+            const response = await this.nevermined.utils.fetch.fetchToken(`${this.url}${authPath}/validate-assertion`, clientAssertion, sessionKey);
             if (!response.ok) {
                 throw new HttpError(`Error Login - ${response.statusText} ${response.url}`, response.status);
             }
-            const backendAuthToken = (await response.json()).access_token;
+            const backendAuthToken = (await response.json()).hash;
             return backendAuthToken;
         }
         catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nevermined-io/core-kit",
-  "version": "0.0.2-rc19",
+  "version": "0.0.2-rc25",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

package/dist/services/MarketplaceAPI.d.ts

@@ -1,7 +0,0 @@
-import { Instantiable, InstantiableConfig } from '../Instantiable.abstract.js';
-export declare class MarketplaceApi extends Instantiable {
-    constructor(config: InstantiableConfig);
-    protected get url(): string | undefined;
-    login(clientAssertion: string): Promise<string>;
-}
-//# sourceMappingURL=MarketplaceAPI.d.ts.map

package/dist/services/MarketplaceAPI.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MarketplaceAPI.d.ts","sourceRoot":"","sources":["../../src/services/MarketplaceAPI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAK9E,qBAAa,cAAe,SAAQ,YAAY;gBAClC,MAAM,EAAE,kBAAkB;IAKtC,SAAS,KAAK,GAAG,uBAEhB;IAEY,KAAK,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAkB7D"}

package/dist/services/MarketplaceAPI.js

@@ -1,25 +0,0 @@
-import { Instantiable } from '../Instantiable.abstract.js';
-import { ApiError, HttpError } from '../errors/NeverminedErrors.js';
-const authPath = '/api/v1/api-keys';
-export class MarketplaceApi extends Instantiable {
-    constructor(config) {
-        super();
-        this.setInstanceConfig(config);
-    }
-    get url() {
-        return this.config.backendUrl;
-    }
-    async login(clientAssertion) {
-        try {
-            const response = await this.nevermined.utils.fetch.fetchToken(`${this.url}${authPath}/login`, clientAssertion);
-            if (!response.ok) {
-                throw new HttpError(`Error Login - ${response.statusText} ${response.url}`, response.status);
-            }
-            const backendAuthToken = (await response.json()).access_token;
-            return backendAuthToken;
-        }
-        catch (error) {
-            throw new ApiError(error instanceof Error ? error.message : String(error));
-        }
-    }
-}