@0xpolygonid/js-sdk 1.17.1 → 1.17.2

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/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/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>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xpolygonid/js-sdk",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "SDK to work with Polygon ID",
   "main": "dist/node/cjs/index.js",
   "module": "dist/node/esm/index.js",
@@ -101,7 +101,7 @@
     "ajv-formats": "2.1.1",
     "did-jwt": "8.0.4",
     "did-resolver": "4.1.0",
-    "ethers": "6.8.0",
+    "ethers": "^6.13.1",
     "idb-keyval": "6.2.0",
     "js-sha3": "0.9.3",
     "jsonld": "8.3.1",