@0xpolygonid/js-sdk 1.17.1 → 1.17.3

package/dist/node/cjs/iden3comm/constants.js

@@ -7,43 +7,43 @@ const IDEN3_PROTOCOL = 'https://iden3-communication.io/';
  */
 exports.PROTOCOL_MESSAGE_TYPE = Object.freeze({
     // AuthorizationV2RequestMessageType defines auth request type of the communication protocol
-    AUTHORIZATION_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'authorization/1.0/request',
+    AUTHORIZATION_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}authorization/1.0/request`,
     // AuthorizationResponseMessageType defines auth response type of the communication protocol
-    AUTHORIZATION_RESPONSE_MESSAGE_TYPE: IDEN3_PROTOCOL + 'authorization/1.0/response',
+    AUTHORIZATION_RESPONSE_MESSAGE_TYPE: `${IDEN3_PROTOCOL}authorization/1.0/response`,
     // CredentialIssuanceRequestMessageType accepts request for credential creation
-    CREDENTIAL_ISSUANCE_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/1.0/issuance-request',
+    CREDENTIAL_ISSUANCE_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/1.0/issuance-request`,
     // CredentialFetchRequestMessageType is type for request of credential generation
-    CREDENTIAL_FETCH_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/1.0/fetch-request',
+    CREDENTIAL_FETCH_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/1.0/fetch-request`,
     // CredentialOfferMessageType is type of message with credential offering
-    CREDENTIAL_OFFER_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/1.0/offer',
+    CREDENTIAL_OFFER_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/1.0/offer`,
     // CredentialIssuanceResponseMessageType is type for message with a credential issuance
-    CREDENTIAL_ISSUANCE_RESPONSE_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/1.0/issuance-response',
+    CREDENTIAL_ISSUANCE_RESPONSE_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/1.0/issuance-response`,
     // CredentialRefreshMessageType is type for message with a credential issuance
-    CREDENTIAL_REFRESH_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/1.0/refresh',
+    CREDENTIAL_REFRESH_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/1.0/refresh`,
     // DeviceRegistrationRequestMessageType defines device registration request type of the communication protocol
-    DEVICE_REGISTRATION_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'devices/1.0/registration',
+    DEVICE_REGISTRATION_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}devices/1.0/registration`,
     // MessageFetMessageFetchRequestMessageType defines message fetch request type of the communication protocol.
-    MESSAGE_FETCH_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'messages/1.0/fetch',
+    MESSAGE_FETCH_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}messages/1.0/fetch`,
     // ProofGenerationRequestMessageType is type for request of proof generation
-    PROOF_GENERATION_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'proofs/1.0/request',
+    PROOF_GENERATION_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}proofs/1.0/request`,
     // ProofGenerationResponseMessageType is type for response of proof generation
-    PROOF_GENERATION_RESPONSE_MESSAGE_TYPE: IDEN3_PROTOCOL + 'proofs/1.0/response',
+    PROOF_GENERATION_RESPONSE_MESSAGE_TYPE: `${IDEN3_PROTOCOL}proofs/1.0/response`,
     // RevocationStatusRequestMessageType is type for request of revocation status
-    REVOCATION_STATUS_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'revocation/1.0/request-status',
+    REVOCATION_STATUS_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}revocation/1.0/request-status`,
     // RevocationStatusResponseMessageType is type for response with a revocation status
-    REVOCATION_STATUS_RESPONSE_MESSAGE_TYPE: IDEN3_PROTOCOL + 'revocation/1.0/status',
+    REVOCATION_STATUS_RESPONSE_MESSAGE_TYPE: `${IDEN3_PROTOCOL}revocation/1.0/status`,
     // ContractInvokeRequestMessageType is type for request of contract invoke request
-    CONTRACT_INVOKE_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'proofs/1.0/contract-invoke-request',
+    CONTRACT_INVOKE_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}proofs/1.0/contract-invoke-request`,
     // CredentialOnchainOfferMessageType is type of message with credential onchain offering
-    CREDENTIAL_ONCHAIN_OFFER_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/1.0/onchain-offer',
+    CREDENTIAL_ONCHAIN_OFFER_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/1.0/onchain-offer`,
     // ProposalRequestMessageType is type for proposal-request message
-    PROPOSAL_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/0.1/proposal-request',
+    PROPOSAL_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/0.1/proposal-request`,
     // ProposalMessageType is type for proposal message
-    PROPOSAL_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/0.1/proposal',
+    PROPOSAL_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/0.1/proposal`,
     // PaymentRequestMessageType is type for payment-request message
-    PAYMENT_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/0.1/payment-request',
+    PAYMENT_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/0.1/payment-request`,
     // PaymentMessageType is type for payment message
-    PAYMENT_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/0.1/payment'
+    PAYMENT_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/0.1/payment`
 });
 /**
  * Media types for iden3 comm communication protocol

package/dist/node/cjs/identity/identity-wallet.js

@@ -685,16 +685,8 @@ class IdentityWallet {
         await this.updateIdentityState(did, true, newTreeState);
         return txId;
     }
-    /** {@inheritdoc IIdentityWallet.addBJJAuthCredential} */
-    async addBJJAuthCredential(did, oldTreeState, isOldStateGenesis, ethSigner, opts, prover // it will be needed in case of non ethereum identities
-    ) {
-        opts.seed = opts.seed ?? (0, js_crypto_1.getRandomBytes)(32);
-        opts.revocationOpts.nonce =
-            opts.revocationOpts.nonce ??
-                (isOldStateGenesis
-                    ? 0
-                    : opts.revocationOpts.nonce ?? new DataView((0, js_crypto_1.getRandomBytes)(12).buffer).getUint32(0));
-        const { authClaim, pubKey } = await this.createAuthCoreClaim(opts.revocationOpts.nonce ?? 0, opts.seed);
+    async getAuthBJJCredential(did, oldTreeState, { nonce, seed, id, type }) {
+        const { authClaim, pubKey } = await this.createAuthCoreClaim(nonce, seed);
         const { hi, hv } = authClaim.hiHv();
         await this._storage.mt.addToMerkleTree(did.string(), storage_1.MerkleTreeType.Claims, hi, hv);
         // Calculate current state after adding credential to merkle tree
@@ -704,34 +696,68 @@ class IdentityWallet {
             oldTreeState.revocationRoot.bigInt(),
             oldTreeState.rootOfRoots.bigInt()
         ]);
-        let credential = await this.createAuthBJJCredential(did, pubKey, authClaim, currentState, opts.revocationOpts);
-        const txId = await this.transitState(did, oldTreeState, isOldStateGenesis, ethSigner, prover);
-        const { receipt, block } = await this._transactionService.getTransactionReceiptAndBlock(txId);
-        const credsWithIden3MTPProof = await this.generateIden3SparseMerkleTreeProof(did, [credential], txId, receipt?.blockNumber, block?.timestamp, undefined, {
-            revNonce: Number(authClaim.getRevocationNonce()),
-            subjectPosition: verifiable_1.SubjectPosition.None,
-            merklizedRootPosition: verifiable_1.MerklizedRootPosition.None,
-            updatable: false,
-            version: 0,
-            merklizeOpts: { documentLoader: (0, schema_processor_1.cacheLoader)() }
+        return this.createAuthBJJCredential(did, pubKey, authClaim, currentState, {
+            id,
+            type
         });
-        await this._credentialWallet.saveAll(credsWithIden3MTPProof);
-        await this._storage.identity.saveIdentity({
-            did: did.string(),
-            state: currentState,
-            isStatePublished: true,
-            isStateGenesis: false
+    }
+    /** {@inheritdoc IIdentityWallet.addBJJAuthCredential} */
+    async addBJJAuthCredential(did, oldTreeState, isOldStateGenesis, ethSigner, opts, prover // it will be needed in case of non ethereum identities
+    ) {
+        opts.seed = opts.seed ?? (0, js_crypto_1.getRandomBytes)(32);
+        opts.revocationOpts.nonce =
+            opts.revocationOpts.nonce ??
+                (isOldStateGenesis
+                    ? 0
+                    : opts.revocationOpts.nonce ?? new DataView((0, js_crypto_1.getRandomBytes)(12).buffer).getUint32(0));
+        const credential = await this.getAuthBJJCredential(did, oldTreeState, {
+            nonce: opts.revocationOpts.nonce,
+            seed: opts.seed,
+            id: opts.revocationOpts.id,
+            type: opts.revocationOpts.type
         });
-        const credRefreshed = await this._credentialWallet.findById(credential.id);
-        if (!credRefreshed) {
-            throw new Error('Credential not found in credential wallet');
+        const addMtpToCredAndPublishRevState = async () => {
+            const { receipt, block } = await this._transactionService.getTransactionReceiptAndBlock(txId);
+            const credsWithIden3MTPProof = await this.generateIden3SparseMerkleTreeProof(did, [credential], txId, receipt?.blockNumber, block?.timestamp, undefined, {
+                revNonce: opts.revocationOpts.nonce ?? 0,
+                subjectPosition: verifiable_1.SubjectPosition.None,
+                merklizedRootPosition: verifiable_1.MerklizedRootPosition.None,
+                updatable: false,
+                version: 0,
+                merklizeOpts: { documentLoader: (0, schema_processor_1.cacheLoader)() }
+            });
+            await this._credentialWallet.saveAll(credsWithIden3MTPProof);
+            await this.publishRevocationInfoByCredentialStatusType(did, opts.revocationOpts.type, {
+                rhsUrl: opts.revocationOpts.id,
+                onChain: opts.revocationOpts.onChain
+            });
+            return credsWithIden3MTPProof[0];
+        };
+        let txId = '';
+        let attempt = 2;
+        do {
+            try {
+                txId = await this.transitState(did, oldTreeState, isOldStateGenesis, ethSigner, prover);
+                break;
+            }
+            catch (err) {
+                console.warn(`Error while transiting state, retrying state transition, attempt: ${attempt}`, err);
+            }
+        } while (--attempt);
+        if (!txId) {
+            const oldTransitStateInfoJson = JSON.stringify({
+                claimsRoot: oldTreeState.claimsRoot.hex(),
+                revocationRoot: oldTreeState.revocationRoot.hex(),
+                rootOfRoots: oldTreeState.rootOfRoots.hex(),
+                state: oldTreeState.state.hex(),
+                isOldStateGenesis,
+                credentialId: credential.id,
+                did: did.string()
+            }, null, 2);
+            await this._credentialWallet.save(credential);
+            throw new Error(`Error publishing state, info to publish: ${oldTransitStateInfoJson}`);
         }
-        credential = credRefreshed;
-        await this.publishRevocationInfoByCredentialStatusType(did, opts.revocationOpts.type, {
-            rhsUrl: opts.revocationOpts.id,
-            onChain: opts.revocationOpts.onChain
-        });
-        return credential;
+        return addMtpToCredAndPublishRevState();
     }
 }
 exports.IdentityWallet = IdentityWallet;

package/dist/node/cjs/storage/blockchain/state.js

@@ -185,7 +185,7 @@ class EthStateStorage {
         const chainId = (0, js_iden3_core_1.getChainId)(js_iden3_core_1.DID.blockchainFromId(idTyped), js_iden3_core_1.DID.networkIdFromId(idTyped));
         const config = this.networkByChainId(chainId);
         const provider = new ethers_1.JsonRpcProvider(config.url);
-        const stateContract = new ethers_1.Contract(config.contractAddress, State_json_1.default, this.provider);
+        const stateContract = new ethers_1.Contract(config.contractAddress, State_json_1.default, provider);
         return { stateContract, provider };
     }
     networkByChainId(chainId) {

package/dist/node/esm/iden3comm/constants.js

@@ -4,43 +4,43 @@ const IDEN3_PROTOCOL = 'https://iden3-communication.io/';
  */
 export const PROTOCOL_MESSAGE_TYPE = Object.freeze({
     // AuthorizationV2RequestMessageType defines auth request type of the communication protocol
-    AUTHORIZATION_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'authorization/1.0/request',
+    AUTHORIZATION_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}authorization/1.0/request`,
     // AuthorizationResponseMessageType defines auth response type of the communication protocol
-    AUTHORIZATION_RESPONSE_MESSAGE_TYPE: IDEN3_PROTOCOL + 'authorization/1.0/response',
+    AUTHORIZATION_RESPONSE_MESSAGE_TYPE: `${IDEN3_PROTOCOL}authorization/1.0/response`,
     // CredentialIssuanceRequestMessageType accepts request for credential creation
-    CREDENTIAL_ISSUANCE_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/1.0/issuance-request',
+    CREDENTIAL_ISSUANCE_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/1.0/issuance-request`,
     // CredentialFetchRequestMessageType is type for request of credential generation
-    CREDENTIAL_FETCH_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/1.0/fetch-request',
+    CREDENTIAL_FETCH_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/1.0/fetch-request`,
     // CredentialOfferMessageType is type of message with credential offering
-    CREDENTIAL_OFFER_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/1.0/offer',
+    CREDENTIAL_OFFER_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/1.0/offer`,
     // CredentialIssuanceResponseMessageType is type for message with a credential issuance
-    CREDENTIAL_ISSUANCE_RESPONSE_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/1.0/issuance-response',
+    CREDENTIAL_ISSUANCE_RESPONSE_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/1.0/issuance-response`,
     // CredentialRefreshMessageType is type for message with a credential issuance
-    CREDENTIAL_REFRESH_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/1.0/refresh',
+    CREDENTIAL_REFRESH_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/1.0/refresh`,
     // DeviceRegistrationRequestMessageType defines device registration request type of the communication protocol
-    DEVICE_REGISTRATION_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'devices/1.0/registration',
+    DEVICE_REGISTRATION_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}devices/1.0/registration`,
     // MessageFetMessageFetchRequestMessageType defines message fetch request type of the communication protocol.
-    MESSAGE_FETCH_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'messages/1.0/fetch',
+    MESSAGE_FETCH_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}messages/1.0/fetch`,
     // ProofGenerationRequestMessageType is type for request of proof generation
-    PROOF_GENERATION_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'proofs/1.0/request',
+    PROOF_GENERATION_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}proofs/1.0/request`,
     // ProofGenerationResponseMessageType is type for response of proof generation
-    PROOF_GENERATION_RESPONSE_MESSAGE_TYPE: IDEN3_PROTOCOL + 'proofs/1.0/response',
+    PROOF_GENERATION_RESPONSE_MESSAGE_TYPE: `${IDEN3_PROTOCOL}proofs/1.0/response`,
     // RevocationStatusRequestMessageType is type for request of revocation status
-    REVOCATION_STATUS_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'revocation/1.0/request-status',
+    REVOCATION_STATUS_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}revocation/1.0/request-status`,
     // RevocationStatusResponseMessageType is type for response with a revocation status
-    REVOCATION_STATUS_RESPONSE_MESSAGE_TYPE: IDEN3_PROTOCOL + 'revocation/1.0/status',
+    REVOCATION_STATUS_RESPONSE_MESSAGE_TYPE: `${IDEN3_PROTOCOL}revocation/1.0/status`,
     // ContractInvokeRequestMessageType is type for request of contract invoke request
-    CONTRACT_INVOKE_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'proofs/1.0/contract-invoke-request',
+    CONTRACT_INVOKE_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}proofs/1.0/contract-invoke-request`,
     // CredentialOnchainOfferMessageType is type of message with credential onchain offering
-    CREDENTIAL_ONCHAIN_OFFER_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/1.0/onchain-offer',
+    CREDENTIAL_ONCHAIN_OFFER_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/1.0/onchain-offer`,
     // ProposalRequestMessageType is type for proposal-request message
-    PROPOSAL_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/0.1/proposal-request',
+    PROPOSAL_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/0.1/proposal-request`,
     // ProposalMessageType is type for proposal message
-    PROPOSAL_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/0.1/proposal',
+    PROPOSAL_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/0.1/proposal`,
     // PaymentRequestMessageType is type for payment-request message
-    PAYMENT_REQUEST_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/0.1/payment-request',
+    PAYMENT_REQUEST_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/0.1/payment-request`,
     // PaymentMessageType is type for payment message
-    PAYMENT_MESSAGE_TYPE: IDEN3_PROTOCOL + 'credentials/0.1/payment'
+    PAYMENT_MESSAGE_TYPE: `${IDEN3_PROTOCOL}credentials/0.1/payment`
 });
 /**
  * Media types for iden3 comm communication protocol

package/dist/node/esm/identity/identity-wallet.js

@@ -659,16 +659,8 @@ export class IdentityWallet {
         await this.updateIdentityState(did, true, newTreeState);
         return txId;
     }
-    /** {@inheritdoc IIdentityWallet.addBJJAuthCredential} */
-    async addBJJAuthCredential(did, oldTreeState, isOldStateGenesis, ethSigner, opts, prover // it will be needed in case of non ethereum identities
-    ) {
-        opts.seed = opts.seed ?? getRandomBytes(32);
-        opts.revocationOpts.nonce =
-            opts.revocationOpts.nonce ??
-                (isOldStateGenesis
-                    ? 0
-                    : opts.revocationOpts.nonce ?? new DataView(getRandomBytes(12).buffer).getUint32(0));
-        const { authClaim, pubKey } = await this.createAuthCoreClaim(opts.revocationOpts.nonce ?? 0, opts.seed);
+    async getAuthBJJCredential(did, oldTreeState, { nonce, seed, id, type }) {
+        const { authClaim, pubKey } = await this.createAuthCoreClaim(nonce, seed);
         const { hi, hv } = authClaim.hiHv();
         await this._storage.mt.addToMerkleTree(did.string(), MerkleTreeType.Claims, hi, hv);
         // Calculate current state after adding credential to merkle tree
@@ -678,33 +670,67 @@ export class IdentityWallet {
             oldTreeState.revocationRoot.bigInt(),
             oldTreeState.rootOfRoots.bigInt()
         ]);
-        let credential = await this.createAuthBJJCredential(did, pubKey, authClaim, currentState, opts.revocationOpts);
-        const txId = await this.transitState(did, oldTreeState, isOldStateGenesis, ethSigner, prover);
-        const { receipt, block } = await this._transactionService.getTransactionReceiptAndBlock(txId);
-        const credsWithIden3MTPProof = await this.generateIden3SparseMerkleTreeProof(did, [credential], txId, receipt?.blockNumber, block?.timestamp, undefined, {
-            revNonce: Number(authClaim.getRevocationNonce()),
-            subjectPosition: SubjectPosition.None,
-            merklizedRootPosition: MerklizedRootPosition.None,
-            updatable: false,
-            version: 0,
-            merklizeOpts: { documentLoader: cacheLoader() }
+        return this.createAuthBJJCredential(did, pubKey, authClaim, currentState, {
+            id,
+            type
         });
-        await this._credentialWallet.saveAll(credsWithIden3MTPProof);
-        await this._storage.identity.saveIdentity({
-            did: did.string(),
-            state: currentState,
-            isStatePublished: true,
-            isStateGenesis: false
+    }
+    /** {@inheritdoc IIdentityWallet.addBJJAuthCredential} */
+    async addBJJAuthCredential(did, oldTreeState, isOldStateGenesis, ethSigner, opts, prover // it will be needed in case of non ethereum identities
+    ) {
+        opts.seed = opts.seed ?? getRandomBytes(32);
+        opts.revocationOpts.nonce =
+            opts.revocationOpts.nonce ??
+                (isOldStateGenesis
+                    ? 0
+                    : opts.revocationOpts.nonce ?? new DataView(getRandomBytes(12).buffer).getUint32(0));
+        const credential = await this.getAuthBJJCredential(did, oldTreeState, {
+            nonce: opts.revocationOpts.nonce,
+            seed: opts.seed,
+            id: opts.revocationOpts.id,
+            type: opts.revocationOpts.type
         });
-        const credRefreshed = await this._credentialWallet.findById(credential.id);
-        if (!credRefreshed) {
-            throw new Error('Credential not found in credential wallet');
+        const addMtpToCredAndPublishRevState = async () => {
+            const { receipt, block } = await this._transactionService.getTransactionReceiptAndBlock(txId);
+            const credsWithIden3MTPProof = await this.generateIden3SparseMerkleTreeProof(did, [credential], txId, receipt?.blockNumber, block?.timestamp, undefined, {
+                revNonce: opts.revocationOpts.nonce ?? 0,
+                subjectPosition: SubjectPosition.None,
+                merklizedRootPosition: MerklizedRootPosition.None,
+                updatable: false,
+                version: 0,
+                merklizeOpts: { documentLoader: cacheLoader() }
+            });
+            await this._credentialWallet.saveAll(credsWithIden3MTPProof);
+            await this.publishRevocationInfoByCredentialStatusType(did, opts.revocationOpts.type, {
+                rhsUrl: opts.revocationOpts.id,
+                onChain: opts.revocationOpts.onChain
+            });
+            return credsWithIden3MTPProof[0];
+        };
+        let txId = '';
+        let attempt = 2;
+        do {
+            try {
+                txId = await this.transitState(did, oldTreeState, isOldStateGenesis, ethSigner, prover);
+                break;
+            }
+            catch (err) {
+                console.warn(`Error while transiting state, retrying state transition, attempt: ${attempt}`, err);
+            }
+        } while (--attempt);
+        if (!txId) {
+            const oldTransitStateInfoJson = JSON.stringify({
+                claimsRoot: oldTreeState.claimsRoot.hex(),
+                revocationRoot: oldTreeState.revocationRoot.hex(),
+                rootOfRoots: oldTreeState.rootOfRoots.hex(),
+                state: oldTreeState.state.hex(),
+                isOldStateGenesis,
+                credentialId: credential.id,
+                did: did.string()
+            }, null, 2);
+            await this._credentialWallet.save(credential);
+            throw new Error(`Error publishing state, info to publish: ${oldTransitStateInfoJson}`);
         }
-        credential = credRefreshed;
-        await this.publishRevocationInfoByCredentialStatusType(did, opts.revocationOpts.type, {
-            rhsUrl: opts.revocationOpts.id,
-            onChain: opts.revocationOpts.onChain
-        });
-        return credential;
+        return addMtpToCredAndPublishRevState();
     }
 }

package/dist/node/esm/storage/blockchain/state.js

@@ -179,7 +179,7 @@ export class EthStateStorage {
         const chainId = getChainId(DID.blockchainFromId(idTyped), DID.networkIdFromId(idTyped));
         const config = this.networkByChainId(chainId);
         const provider = new JsonRpcProvider(config.url);
-        const stateContract = new Contract(config.contractAddress, abi, this.provider);
+        const stateContract = new Contract(config.contractAddress, abi, provider);
         return { stateContract, provider };
     }
     networkByChainId(chainId) {

package/dist/types/iden3comm/constants.d.ts

@@ -2,25 +2,25 @@
  * Constants for Iden3 protocol
  */
 export declare const PROTOCOL_MESSAGE_TYPE: Readonly<{
-    AUTHORIZATION_REQUEST_MESSAGE_TYPE: string;
-    AUTHORIZATION_RESPONSE_MESSAGE_TYPE: string;
-    CREDENTIAL_ISSUANCE_REQUEST_MESSAGE_TYPE: string;
-    CREDENTIAL_FETCH_REQUEST_MESSAGE_TYPE: string;
-    CREDENTIAL_OFFER_MESSAGE_TYPE: string;
-    CREDENTIAL_ISSUANCE_RESPONSE_MESSAGE_TYPE: string;
-    CREDENTIAL_REFRESH_MESSAGE_TYPE: string;
-    DEVICE_REGISTRATION_REQUEST_MESSAGE_TYPE: string;
-    MESSAGE_FETCH_REQUEST_MESSAGE_TYPE: string;
-    PROOF_GENERATION_REQUEST_MESSAGE_TYPE: string;
-    PROOF_GENERATION_RESPONSE_MESSAGE_TYPE: string;
-    REVOCATION_STATUS_REQUEST_MESSAGE_TYPE: string;
-    REVOCATION_STATUS_RESPONSE_MESSAGE_TYPE: string;
-    CONTRACT_INVOKE_REQUEST_MESSAGE_TYPE: string;
-    CREDENTIAL_ONCHAIN_OFFER_MESSAGE_TYPE: string;
-    PROPOSAL_REQUEST_MESSAGE_TYPE: string;
-    PROPOSAL_MESSAGE_TYPE: string;
-    PAYMENT_REQUEST_MESSAGE_TYPE: string;
-    PAYMENT_MESSAGE_TYPE: string;
+    AUTHORIZATION_REQUEST_MESSAGE_TYPE: "https://iden3-communication.io/authorization/1.0/request";
+    AUTHORIZATION_RESPONSE_MESSAGE_TYPE: "https://iden3-communication.io/authorization/1.0/response";
+    CREDENTIAL_ISSUANCE_REQUEST_MESSAGE_TYPE: "https://iden3-communication.io/credentials/1.0/issuance-request";
+    CREDENTIAL_FETCH_REQUEST_MESSAGE_TYPE: "https://iden3-communication.io/credentials/1.0/fetch-request";
+    CREDENTIAL_OFFER_MESSAGE_TYPE: "https://iden3-communication.io/credentials/1.0/offer";
+    CREDENTIAL_ISSUANCE_RESPONSE_MESSAGE_TYPE: "https://iden3-communication.io/credentials/1.0/issuance-response";
+    CREDENTIAL_REFRESH_MESSAGE_TYPE: "https://iden3-communication.io/credentials/1.0/refresh";
+    DEVICE_REGISTRATION_REQUEST_MESSAGE_TYPE: "https://iden3-communication.io/devices/1.0/registration";
+    MESSAGE_FETCH_REQUEST_MESSAGE_TYPE: "https://iden3-communication.io/messages/1.0/fetch";
+    PROOF_GENERATION_REQUEST_MESSAGE_TYPE: "https://iden3-communication.io/proofs/1.0/request";
+    PROOF_GENERATION_RESPONSE_MESSAGE_TYPE: "https://iden3-communication.io/proofs/1.0/response";
+    REVOCATION_STATUS_REQUEST_MESSAGE_TYPE: "https://iden3-communication.io/revocation/1.0/request-status";
+    REVOCATION_STATUS_RESPONSE_MESSAGE_TYPE: "https://iden3-communication.io/revocation/1.0/status";
+    CONTRACT_INVOKE_REQUEST_MESSAGE_TYPE: "https://iden3-communication.io/proofs/1.0/contract-invoke-request";
+    CREDENTIAL_ONCHAIN_OFFER_MESSAGE_TYPE: "https://iden3-communication.io/credentials/1.0/onchain-offer";
+    PROPOSAL_REQUEST_MESSAGE_TYPE: "https://iden3-communication.io/credentials/0.1/proposal-request";
+    PROPOSAL_MESSAGE_TYPE: "https://iden3-communication.io/credentials/0.1/proposal";
+    PAYMENT_REQUEST_MESSAGE_TYPE: "https://iden3-communication.io/credentials/0.1/payment-request";
+    PAYMENT_MESSAGE_TYPE: "https://iden3-communication.io/credentials/0.1/payment";
 }>;
 /**
  * Media types for iden3 comm communication protocol

package/dist/types/iden3comm/types/packer.d.ts

@@ -2,13 +2,13 @@ import { DID } from '@iden3/js-iden3-core';
 import { DataPrepareHandlerFunc, VerificationHandlerFunc } from '../packers';
 import { ProvingMethodAlg } from '@iden3/js-jwz';
 import { CircuitId } from '../../circuits';
-import { MediaType } from '../constants';
+import { MediaType, PROTOCOL_MESSAGE_TYPE } from '../constants';
 import { DIDDocument, VerificationMethod } from 'did-resolver';
 import { StateVerificationOpts } from './models';
 /**
  *  Protocol message type
  */
-export type ProtocolMessage = string;
+export type ProtocolMessage = (typeof PROTOCOL_MESSAGE_TYPE)[keyof typeof PROTOCOL_MESSAGE_TYPE];
 /**
  * JSONValue
  */

package/dist/types/iden3comm/types/protocol/auth.d.ts

@@ -1,10 +1,12 @@
 import { ZKProof } from '@iden3/js-jwz';
 import { BasicMessage, JSONObject } from '../packer';
+import { PROTOCOL_MESSAGE_TYPE } from '../../constants';
 /** AuthorizationResponseMessage is struct the represents iden3message authorization response */
 export type AuthorizationResponseMessage = BasicMessage & {
     body: AuthorizationMessageResponseBody;
     from: string;
     to: string;
+    type: typeof PROTOCOL_MESSAGE_TYPE.AUTHORIZATION_RESPONSE_MESSAGE_TYPE;
 };
 /** AuthorizationMessageResponseBody is struct the represents authorization response data */
 export type AuthorizationMessageResponseBody = {
@@ -16,6 +18,7 @@ export type AuthorizationMessageResponseBody = {
 export type AuthorizationRequestMessage = BasicMessage & {
     body: AuthorizationRequestMessageBody;
     from: string;
+    type: typeof PROTOCOL_MESSAGE_TYPE.AUTHORIZATION_REQUEST_MESSAGE_TYPE;
 };
 /** AuthorizationRequestMessageBody is body for authorization request */
 export type AuthorizationRequestMessageBody = {

package/dist/types/iden3comm/types/protocol/contract-request.d.ts

@@ -1,8 +1,10 @@
+import { PROTOCOL_MESSAGE_TYPE } from '../../constants';
 import { BasicMessage } from '../packer';
 import { ZeroKnowledgeProofRequest } from './auth';
 /** ContractInvokeRequest represents structure of contract invoke request object */
 export type ContractInvokeRequest = BasicMessage & {
     body: ContractInvokeRequestBody;
+    type: typeof PROTOCOL_MESSAGE_TYPE.CONTRACT_INVOKE_REQUEST_MESSAGE_TYPE;
 };
 /** ContractInvokeRequestBody represents structure of contract invoke request body object */
 export type ContractInvokeRequestBody = {

package/dist/types/iden3comm/types/protocol/credentials.d.ts

@@ -1,4 +1,5 @@
 import { W3CCredential } from '../../../verifiable';
+import { PROTOCOL_MESSAGE_TYPE } from '../../constants';
 import { BasicMessage, JSONObject } from '../packer';
 import { ContractInvokeTransactionData } from './contract-request';
 /** CredentialIssuanceRequestMessageBody represents data for credential issuance request */
@@ -10,19 +11,22 @@ export type CredentialIssuanceRequestMessageBody = {
 /** CredentialIssuanceRequestMessage represent Iden3message for credential request */
 export type CredentialIssuanceRequestMessage = Required<BasicMessage> & {
     body: CredentialIssuanceRequestMessageBody;
+    type: typeof PROTOCOL_MESSAGE_TYPE.CREDENTIAL_ISSUANCE_REQUEST_MESSAGE_TYPE;
 };
 /** CredentialsOfferMessage represent Iden3message for credential offer */
 export type CredentialsOfferMessage = Required<BasicMessage> & {
     body: CredentialsOfferMessageBody;
+    type: typeof PROTOCOL_MESSAGE_TYPE.CREDENTIAL_OFFER_MESSAGE_TYPE;
 };
 /** CredentialsOfferMessageBody is struct the represents offer message */
 export type CredentialsOfferMessageBody = {
     url: string;
     credentials: CredentialOffer[];
 };
-/** CredentialsOnchainOfferMessage represent Iden3message for credential onhcain offer message */
+/** CredentialsOnchainOfferMessage represent Iden3message for credential onchain offer message */
 export type CredentialsOnchainOfferMessage = Required<BasicMessage> & {
     body: CredentialsOnchainOfferMessageBody;
+    type: typeof PROTOCOL_MESSAGE_TYPE.CREDENTIAL_ONCHAIN_OFFER_MESSAGE_TYPE;
 };
 /** CredentialsOnchainOfferMessageBody is struct the represents onchain offer message body */
 export type CredentialsOnchainOfferMessageBody = {
@@ -44,6 +48,7 @@ export type CredentialOffer = {
 /** CredentialIssuanceMessage represent Iden3message for credential issuance */
 export type CredentialIssuanceMessage = Required<BasicMessage> & {
     body: IssuanceMessageBody;
+    type: typeof PROTOCOL_MESSAGE_TYPE.CREDENTIAL_ISSUANCE_RESPONSE_MESSAGE_TYPE;
 };
 /** IssuanceMessageBody is struct the represents message when credential is issued */
 export type IssuanceMessageBody = {
@@ -52,6 +57,7 @@ export type IssuanceMessageBody = {
 /** CredentialFetchRequestMessage represent Iden3message for credential fetch request */
 export type CredentialFetchRequestMessage = BasicMessage & {
     body?: CredentialFetchRequestMessageBody;
+    type: typeof PROTOCOL_MESSAGE_TYPE.CREDENTIAL_FETCH_REQUEST_MESSAGE_TYPE;
 };
 /** CredentialFetchRequestMessageBody is msg body for fetch request */
 export type CredentialFetchRequestMessageBody = {
@@ -66,6 +72,7 @@ export type Schema = {
 /** CredentialRefreshMessage represent Iden3message for credential refresh request */
 export type CredentialRefreshMessage = Required<BasicMessage> & {
     body?: CredentialRefreshMessageBody;
+    type: typeof PROTOCOL_MESSAGE_TYPE.CREDENTIAL_REFRESH_MESSAGE_TYPE;
 };
 /** CredentialRefreshMessageBody is msg body for refresh request */
 export type CredentialRefreshMessageBody = {

package/dist/types/iden3comm/types/protocol/messages.d.ts

@@ -1,7 +1,9 @@
 import { BasicMessage } from '../';
+import { PROTOCOL_MESSAGE_TYPE } from '../../constants';
 /**  MessageFetchRequestMessage represent Iden3message for message fetch request. */
 export type MessageFetchRequestMessage = Required<BasicMessage> & {
     body?: MessageFetchRequestMessageBody;
+    type: typeof PROTOCOL_MESSAGE_TYPE.CREDENTIAL_FETCH_REQUEST_MESSAGE_TYPE;
 };
 /** MessageFetchRequestMessageBody is struct the represents body for message fetch request. */
 export type MessageFetchRequestMessageBody = {

package/dist/types/iden3comm/types/protocol/payment.d.ts

@@ -1,8 +1,10 @@
 import { BasicMessage } from '../';
 import { PaymentRequestDataType, PaymentRequestType, PaymentType } from '../../../verifiable';
+import { PROTOCOL_MESSAGE_TYPE } from '../../constants';
 /** @beta PaymentRequestMessage is struct the represents payment-request message */
 export type PaymentRequestMessage = BasicMessage & {
     body: PaymentRequestMessageBody;
+    type: typeof PROTOCOL_MESSAGE_TYPE.PAYMENT_REQUEST_MESSAGE_TYPE;
 };
 /** @beta PaymentRequestMessageBody is struct the represents body for payment-request */
 export type PaymentRequestMessageBody = {
@@ -33,6 +35,7 @@ export type PaymentRequestDataInfo = {
 /** @beta  PaymentMessage is struct the represents payment message */
 export type PaymentMessage = BasicMessage & {
     body: PaymentMessageBody;
+    type: typeof PROTOCOL_MESSAGE_TYPE.PAYMENT_MESSAGE_TYPE;
 };
 /** @beta  PaymentMessageBody is struct the represents body for payment message */
 export type PaymentMessageBody = {

package/dist/types/iden3comm/types/protocol/proof.d.ts

@@ -1,8 +1,10 @@
 import { BasicMessage } from '../';
+import { PROTOCOL_MESSAGE_TYPE } from '../../constants';
 import { ZeroKnowledgeProofRequest, ZeroKnowledgeProofResponse } from './auth';
 /** ProofGenerationRequestMessage is struct the represents body for proof generation request */
 export type ProofGenerationRequestMessage = Required<BasicMessage> & {
     body?: ProofGenerationRequestMessageBody;
+    type: typeof PROTOCOL_MESSAGE_TYPE.PROOF_GENERATION_REQUEST_MESSAGE_TYPE;
 };
 /** ProofGenerationRequestMessageBody is struct the represents body for proof generation request */
 export type ProofGenerationRequestMessageBody = {
@@ -11,6 +13,7 @@ export type ProofGenerationRequestMessageBody = {
 /** ProofGenerationResponseMessage is struct the represents body for proof generation request */
 export type ProofGenerationResponseMessage = Required<BasicMessage> & {
     body?: ResponseMessageBody;
+    type: typeof PROTOCOL_MESSAGE_TYPE.PROOF_GENERATION_RESPONSE_MESSAGE_TYPE;
 };
 /** ResponseMessageBody is struct the represents request for revocation status */
 export type ResponseMessageBody = {

package/dist/types/iden3comm/types/protocol/proposal-request.d.ts

@@ -1,7 +1,9 @@
 import { BasicMessage, JSONObject } from '../';
+import { PROTOCOL_MESSAGE_TYPE } from '../../constants';
 /** @beta ProposalRequestMessage is struct the represents proposal-request message */
 export type ProposalRequestMessage = BasicMessage & {
     body?: ProposalRequestMessageBody;
+    type: typeof PROTOCOL_MESSAGE_TYPE.PROPOSAL_REQUEST_MESSAGE_TYPE;
 };
 /** @beta ProposalRequestMessageBody is struct the represents body for proposal-request */
 export type ProposalRequestMessageBody = {
@@ -15,6 +17,7 @@ export type ProposalRequestMessageBody = {
 /** @beta  ProposalMessage is struct the represents proposal message */
 export type ProposalMessage = BasicMessage & {
     body?: ProposalMessageBody;
+    type: typeof PROTOCOL_MESSAGE_TYPE.PROPOSAL_MESSAGE_TYPE;
 };
 /** @beta  ProposalMessageBody is struct the represents body for proposal message */
 export type ProposalMessageBody = {

package/dist/types/iden3comm/types/protocol/revocation.d.ts

@@ -1,8 +1,10 @@
 import { BasicMessage } from '../';
 import { RevocationStatus } from '../../../verifiable';
+import { PROTOCOL_MESSAGE_TYPE } from '../../constants';
 /** RevocationStatusRequestMessage is struct the represents body for proof generation request */
 export type RevocationStatusRequestMessage = BasicMessage & {
     body?: RevocationStatusRequestMessageBody;
+    type: typeof PROTOCOL_MESSAGE_TYPE.REVOCATION_STATUS_REQUEST_MESSAGE_TYPE;
 };
 /** RevocationStatusRequestMessageBody is struct the represents request for revocation status */
 export type RevocationStatusRequestMessageBody = {
@@ -11,6 +13,7 @@ export type RevocationStatusRequestMessageBody = {
 /** RevocationStatusResponseMessage is struct the represents body for proof generation request */
 export type RevocationStatusResponseMessage = Required<BasicMessage> & {
     body?: RevocationStatusResponseMessageBody;
+    type: typeof PROTOCOL_MESSAGE_TYPE.REVOCATION_STATUS_RESPONSE_MESSAGE_TYPE;
 };
 /** RevocationStatusResponseMessageBody is struct the represents request for revocation status */
 export type RevocationStatusResponseMessageBody = RevocationStatus;

package/dist/types/identity/identity-wallet.d.ts

@@ -444,6 +444,7 @@ export declare class IdentityWallet implements IIdentityWallet {
     updateIdentityState(issuerDID: DID, published: boolean, treeState?: TreeState): Promise<void>;
     /** {@inheritdoc IIdentityWallet.transitState} */
     transitState(did: DID, oldTreeState: TreeState, isOldStateGenesis: boolean, ethSigner: Signer, prover?: IZKProver): Promise<string>;
+    private getAuthBJJCredential;
     /** {@inheritdoc IIdentityWallet.addBJJAuthCredential} */
     addBJJAuthCredential(did: DID, oldTreeState: TreeState, isOldStateGenesis: boolean, ethSigner: Signer, opts: AuthBJJCredentialCreationOptions, prover?: IZKProver): Promise<W3CCredential>;
 }