fix: only remove session if it's not the new one

Signed-off-by: Ariel Gentile <gentilester@gmail.com> feat: deliver messages individually, not fetching from the queue every time Signed-off-by: Ariel Gentile <gentilester@gmail.com> chore: revert to free runners (openwallet-foundation#1662) Signed-off-by: Ry Jones <ry@linux.com> Signed-off-by: Ariel Gentile <gentilester@gmail.com> chore: create settings.yml (openwallet-foundation#1663) Signed-off-by: Ry Jones <ry@linux.com> Signed-off-by: Ariel Gentile <gentilester@gmail.com> chore: fix ci and add note to readme (openwallet-foundation#1669) Signed-off-by: Timo Glastra <timo@animo.id> Signed-off-by: Ariel Gentile <gentilester@gmail.com> docs: update active maintainers (openwallet-foundation#1664) Signed-off-by: Karim Stekelenburg <karim@animo.id> Signed-off-by: Ariel Gentile <gentilester@gmail.com> feat: did:peer:2 and did:peer:4 support in DID Exchange (openwallet-foundation#1550) Signed-off-by: Ariel Gentile <gentilester@gmail.com> feat(presentation-exchange): added PresentationExchangeService (openwallet-foundation#1672) Signed-off-by: Berend Sliedrecht <sliedrecht@berend.io> Signed-off-by: Ariel Gentile <gentilester@gmail.com> chore: removed jan as maintainer (openwallet-foundation#1678) Signed-off-by: Timo Glastra <timo@animo.id> Signed-off-by: Ariel Gentile <gentilester@gmail.com> ci: change secret (openwallet-foundation#1679) Signed-off-by: Timo Glastra <timo@animo.id> Signed-off-by: Ariel Gentile <gentilester@gmail.com> chore: add meta to rxjs timeout errors (openwallet-foundation#1683) Signed-off-by: Timo Glastra <timo@animo.id> Signed-off-by: Ariel Gentile <gentilester@gmail.com> build(deps): bump ws and @types/ws (openwallet-foundation#1686) Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Ariel Gentile <gentilester@gmail.com> build(deps): bump follow-redirects from 1.15.2 to 1.15.4 (openwallet-foundation#1694) Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Ariel Gentile <gentilester@gmail.com> chore: update shared components libraries (openwallet-foundation#1691) Signed-off-by: Timo Glastra <timo@animo.id> Signed-off-by: Ariel Gentile <gentilester@gmail.com> fix: properly print key class (openwallet-foundation#1684) Signed-off-by: Timo Glastra <timo@animo.id> Signed-off-by: Ariel Gentile <gentilester@gmail.com> feat(present-proof): add support for aries RFC 510 (openwallet-foundation#1676) Signed-off-by: Berend Sliedrecht <sliedrecht@berend.io> Signed-off-by: Ariel Gentile <gentilester@gmail.com> fix(present-proof): isolated tests (openwallet-foundation#1696) Signed-off-by: Ariel Gentile <gentilester@gmail.com> feat(indy-vdr): register revocation registry definitions and status list (openwallet-foundation#1693) Signed-off-by: Ariel Gentile <gentilester@gmail.com> chore: rename to credo-ts (openwallet-foundation#1703) Signed-off-by: Ry Jones <ry@linux.com> Signed-off-by: Ariel Gentile <gentilester@gmail.com> ci: fix git checkout path and update setup-node (openwallet-foundation#1709) Signed-off-by: Ariel Gentile <gentilester@gmail.com> fix: remove check for DifPresentationExchangeService dependency (openwallet-foundation#1702) Signed-off-by: Sai Ranjit Tummalapalli <sairanjit.tummalapalli@ayanworks.com> Signed-off-by: Ariel Gentile <gentilester@gmail.com> docs: update zoom meeting link (openwallet-foundation#1706) Signed-off-by: Timo Glastra <timo@animo.id> Signed-off-by: Ariel Gentile <gentilester@gmail.com> refactor(oob)!: make label optional (openwallet-foundation#1680) Signed-off-by: Timo Glastra <timo@animo.id> Co-authored-by: Ariel Gentile <gentilester@gmail.com> Signed-off-by: Ariel Gentile <gentilester@gmail.com> feat: support short legacy connectionless invitations (openwallet-foundation#1705) Signed-off-by: Timo Glastra <timo@animo.id> Signed-off-by: Ariel Gentile <gentilester@gmail.com> feat(dids)!: did caching (openwallet-foundation#1710) feat: did caching Signed-off-by: Timo Glastra <timo@animo.id> Signed-off-by: Ariel Gentile <gentilester@gmail.com> fix: jsonld document loader node 18 (openwallet-foundation#1454) Signed-off-by: Timo Glastra <timo@animo.id> Signed-off-by: Ariel Gentile <gentilester@gmail.com> build(deps): bump amannn/action-semantic-pull-request from 5.3.0 to 5.4.0 (openwallet-foundation#1656) build(deps): bump amannn/action-semantic-pull-request Bumps [amannn/action-semantic-pull-request](https://github.com/amannn/action-semantic-pull-request) from 5.3.0 to 5.4.0. - [Release notes](https://github.com/amannn/action-semantic-pull-request/releases) - [Changelog](https://github.com/amannn/action-semantic-pull-request/blob/main/CHANGELOG.md) - [Commits](amannn/action-semantic-pull-request@v5.3.0...v5.4.0) --- updated-dependencies: - dependency-name: amannn/action-semantic-pull-request dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Timo Glastra <timo@animo.id> Signed-off-by: Ariel Gentile <gentilester@gmail.com> feat: did rotate (openwallet-foundation#1699) Signed-off-by: Ariel Gentile <gentilester@gmail.com> refactor: pickup protocol method names Signed-off-by: Ariel Gentile <gentilester@gmail.com>
genaris · Jan 29, 2024 · 5afcd33 · 5afcd33
1 parent c198993
commit 5afcd33
Show file tree

Hide file tree

Showing 181 changed files with 7,230 additions and 894 deletions.
diff --git a/.github/settings.yml b/.github/settings.yml
@@ -0,0 +1,18 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+repository:
+  name: credo-ts
+  description: Extension libraries for Aries Framework JavaScript
+  homepage: https://github.com/openwallet-foundation/credo-ts
+  default_branch: main
+  has_downloads: false
+  has_issues: true
+  has_projects: false
+  has_wiki: false
+  archived: false
+  private: false
+  allow_squash_merge: true
+  allow_merge_commit: false
+  allow_rebase_merge: true
diff --git a/.github/workflows/continuous-deployment.yml b/.github/workflows/continuous-deployment.yml
@@ -10,11 +10,11 @@ env:
 
 jobs:
   release-canary:
-    runs-on: aries-ubuntu-2004
+    runs-on: ubuntu-20.04
     name: Release Canary
     if: "!startsWith(github.event.head_commit.message, 'chore(release): v')"
     steps:
-      - name: Checkout aries-framework-javascript
+      - name: Checkout credo-ts
         uses: actions/checkout@v4
         with:
           # pulls all commits (needed for lerna to correctly version)
@@ -25,7 +25,7 @@ jobs:
         uses: ./.github/actions/setup-libindy
 
       - name: Setup NodeJS
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'yarn'
@@ -40,8 +40,8 @@ jobs:
           export NEXT_VERSION_BUMP=$(./node_modules/.bin/ts-node ./scripts/get-next-bump.ts)
           yarn lerna publish --loglevel=verbose --canary $NEXT_VERSION_BUMP --exact --force-publish --yes --no-verify-access --dist-tag alpha
         env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_PUBLISH }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH }}
 
       - name: Get version number
         id: get-version
@@ -61,7 +61,7 @@ jobs:
           git push origin v${{ steps.get-version.outputs.version }} --no-verify
 
   release-stable:
-    runs-on: aries-ubuntu-2004
+    runs-on: ubuntu-20.04
     name: Create Stable Release
     # Only run if the last pushed commit is a release commit
     if: "startsWith(github.event.head_commit.message, 'chore(release): v')"
@@ -74,7 +74,7 @@ jobs:
         uses: ./.github/actions/setup-libindy
 
       - name: Setup NodeJS
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'yarn'
@@ -109,5 +109,5 @@ jobs:
       - name: Release to NPM
         run: yarn lerna publish from-package --loglevel=verbose --yes --no-verify-access
         env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_PUBLISH }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH }}
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -12,7 +12,7 @@ env:
   TEST_AGENT_PUBLIC_DID_SEED: 000000000000000000000000Trustee9
   ENDORSER_AGENT_PUBLIC_DID_SEED: 00000000000000000000000Endorser9
   GENESIS_TXN_PATH: network/genesis/local-genesis.txn
-  LIB_INDY_STRG_POSTGRES: /home/runner/work/aries-framework-javascript/indy-sdk/experimental/plugins/postgres_storage/target/release # for Linux
+  LIB_INDY_STRG_POSTGRES: /home/runner/work/credo-ts/indy-sdk/experimental/plugins/postgres_storage/target/release # for Linux
   NODE_OPTIONS: --max_old_space_size=6144
 
 # Make sure we're not running multiple release steps at the same time as this can give issues with determining the next npm version to release.
@@ -28,7 +28,7 @@ jobs:
   # validation scripts. To still be able to run the CI we can manually trigger it by adding the 'ci-test'
   # label to the pull request
   ci-trigger:
-    runs-on: aries-ubuntu-2004
+    runs-on: ubuntu-20.04
     outputs:
       triggered: ${{ steps.check.outputs.triggered }}
     steps:
@@ -47,18 +47,18 @@ jobs:
           echo triggered="${SHOULD_RUN}" >> "$GITHUB_OUTPUT"
 
   validate:
-    runs-on: aries-ubuntu-2004
+    runs-on: ubuntu-20.04
     name: Validate
     steps:
-      - name: Checkout aries-framework-javascript
+      - name: Checkout credo-ts
         uses: actions/checkout@v4
 
       # setup dependencies
       - name: Setup Libindy
         uses: ./.github/actions/setup-libindy
 
       - name: Setup NodeJS
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'yarn'
@@ -79,7 +79,7 @@ jobs:
         run: yarn build
 
   integration-test:
-    runs-on: aries-ubuntu-2004
+    runs-on: ubuntu-20.04
     name: Integration Tests
 
     strategy:
@@ -111,7 +111,7 @@ jobs:
         uses: ./.github/actions/setup-postgres-wallet-plugin
 
       - name: Setup NodeJS
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'yarn'
@@ -126,12 +126,12 @@ jobs:
         if: always()
 
   version-stable:
-    runs-on: aries-ubuntu-2004
+    runs-on: ubuntu-20.04
     name: Release stable
     needs: [integration-test, validate]
     if: github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch'
     steps:
-      - name: Checkout aries-framework-javascript
+      - name: Checkout agent-framework-javascript
         uses: actions/checkout@v4
         with:
           # pulls all commits (needed for lerna to correctly version)
@@ -143,7 +143,7 @@ jobs:
         uses: ./.github/actions/setup-libindy
 
       - name: Setup NodeJS
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'yarn'

diff --git a/.github/workflows/lint-pr.yml b/.github/workflows/lint-pr.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       # Please look up the latest version from
       # https://github.com/amannn/action-semantic-pull-request/releases
-      - uses: amannn/action-semantic-pull-request@v5.3.0
+      - uses: amannn/action-semantic-pull-request@v5.4.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
-# Aries Framework Javascript maintainers
-*	@hyperledger/aries-framework-javascript-committers
+# Agent Framework Javascript maintainers
+*	@openwallet-foundation/agent-framework-javascript-maintainers
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -4,10 +4,8 @@
 
 | name               | Github                                                     | Discord          |
 | ------------------ | ---------------------------------------------------------- | ---------------- |
-| Berend Sliedrecht  | [@blu3beri](https://github.com/blu3beri)                   | blu3beri#2230    |
+| Berend Sliedrecht  | [@berendsliedrecht](https://github.com/berendsliedrecht)   | blu3beri#2230    |
 | Jakub Kočí         | [@jakubkoci](https://github.com/jakubkoci)                 | jakubkoci#1481   |
-| James Ebert        | [@JamesKEbert](https://github.com/JamesKEbert)             | JamesEbert#4350  |
 | Karim Stekelenburg | [@karimStekelenburg](https://github.com/karimStekelenburg) | ssi_karim#3505   |
 | Timo Glastra       | [@TimoGlastra](https://github.com/TimoGlastra)             | TimoGlastra#2988 |
 | Ariel Gentile      | [@genaris](https://github.com/genaris)                     | GenAris#4962     |
-| Jan Rietveld       | [@janrtvld](https://github.com/janrtvld)                   | janrtvld#3868    |
diff --git a/README.md b/README.md
@@ -40,6 +40,13 @@
 
 Aries Framework JavaScript is a framework written in TypeScript for building **SSI Agents and DIDComm services** that aims to be **compliant and interoperable** with the standards defined in the [Aries RFCs](https://github.com/hyperledger/aries-rfcs).
 
+> **Note**
+> The Aries Framework JavaScript project has recently been moved from the Hyperledger Foundation to the Open Wallet Foundation.
+> We are currently in the process of changing the name of the project, and updating all the documentation and links to reflect this change.
+> You may encounter some broken links, or references to the old name, but we are working hard to fix this. Once the new name has been decided
+> we will update this README and all the documentation to reflect this change.
+> You can follow this discussion for updates about the name: https://github.com/openwallet-foundation/agent-framework-javascript/discussions/1668
+
 ## Features
 
 - 🏃 Runs in React Native & Node.JS
@@ -186,10 +193,7 @@ Although Aries Framework JavaScript tries to follow the standards as described i
 
 If you would like to contribute to the framework, please read the [Framework Developers README](/DEVREADME.md) and the [CONTRIBUTING](/CONTRIBUTING.md) guidelines. These documents will provide more information to get you started!
 
-The Aries Framework JavaScript call takes place every week at Thursday, 6AM Pacific Time. See [World Time Buddy](https://www.worldtimebuddy.com/?qm=1&lid=5,2759794,8&h=5&date=2023-5-19&sln=9-10&hf=1) for the time in your timezone. The meeting is held on [Zoom](https://zoom.us/j/99751084865?pwd=TW1rU0FDVTBqUlhnWnY2NERkd1diZz09).
-This meeting is for contributors to groom and plan the backlog, and discuss issues.
-Meeting agendas and recordings can be found [here](https://wiki.hyperledger.org/display/ARIES/Framework+JS+Meetings).
-Feel free to join!
+There are regular community working groups to discuss ongoing efforts within the framework, showcase items you've built with Credo, or ask questions. See [Meeting Information](https://github.com/openwallet-foundation/credo-ts/wiki/Meeting-Information) for up to date information on the meeting schedule. Everyone is welcome to join!
 
 ## License
 

diff --git a/demo/package.json b/demo/package.json
@@ -14,9 +14,9 @@
     "refresh": "rm -rf ./node_modules ./yarn.lock && yarn"
   },
   "dependencies": {
-    "@hyperledger/indy-vdr-nodejs": "^0.2.0-dev.5",
-    "@hyperledger/anoncreds-nodejs": "^0.2.0-dev.4",
-    "@hyperledger/aries-askar-nodejs": "^0.2.0-dev.1",
+    "@hyperledger/indy-vdr-nodejs": "^0.2.0-dev.6",
+    "@hyperledger/anoncreds-nodejs": "^0.2.0-dev.5",
+    "@hyperledger/aries-askar-nodejs": "^0.2.0-dev.5",
     "inquirer": "^8.2.5"
   },
   "devDependencies": {

diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "next-version-bump": "ts-node ./scripts/get-next-bump.ts"
   },
   "devDependencies": {
-    "@hyperledger/aries-askar-nodejs": "^0.2.0-dev.1",
+    "@hyperledger/aries-askar-nodejs": "^0.2.0-dev.5",
     "@types/cors": "^2.8.10",
     "@types/eslint": "^8.21.2",
     "@types/express": "^4.17.13",

diff --git a/packages/anoncreds-rs/package.json b/packages/anoncreds-rs/package.json
@@ -32,15 +32,15 @@
     "tsyringe": "^4.8.0"
   },
   "devDependencies": {
-    "@hyperledger/anoncreds-nodejs": "^0.2.0-dev.4",
-    "@hyperledger/anoncreds-shared": "^0.2.0-dev.4",
+    "@hyperledger/anoncreds-nodejs": "^0.2.0-dev.5",
+    "@hyperledger/anoncreds-shared": "^0.2.0-dev.5",
     "@types/ref-array-di": "^1.2.6",
     "@types/ref-struct-di": "^1.1.10",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^4.4.0",
     "typescript": "~4.9.5"
   },
   "peerDependencies": {
-    "@hyperledger/anoncreds-shared": "^0.2.0-dev.4"
+    "@hyperledger/anoncreds-shared": "^0.2.0-dev.5"
   }
 }
diff --git a/packages/anoncreds-rs/tests/LocalDidResolver.ts b/packages/anoncreds-rs/tests/LocalDidResolver.ts
@@ -4,6 +4,7 @@ import { DidsApi } from '@aries-framework/core'
 
 export class LocalDidResolver implements DidResolver {
   public readonly supportedMethods = ['sov', 'indy']
+  public readonly allowsCaching = false
 
   public async resolve(agentContext: AgentContext, did: string): Promise<DidResolutionResult> {
     const didDocumentMetadata = {}

diff --git a/packages/anoncreds-rs/tests/anoncreds-flow.test.ts b/packages/anoncreds-rs/tests/anoncreds-flow.test.ts
@@ -230,7 +230,7 @@ async function anonCredsFlowTest(options: { issuerId: string; revocable: boolean
       options: {},
     })
 
-    if (!revocationStatusListState.revocationStatusList || !revocationStatusListState.timestamp) {
+    if (!revocationStatusListState.revocationStatusList) {
       throw new Error('Failed to create revocation status list')
     }
   }

diff --git a/packages/anoncreds/src/index.ts b/packages/anoncreds/src/index.ts
@@ -15,3 +15,4 @@ export { generateLegacyProverDidLikeString } from './utils/proverDid'
 export * from './utils/indyIdentifiers'
 export { assertBestPracticeRevocationInterval } from './utils/revocationInterval'
 export { storeLinkSecret } from './utils/linkSecret'
+export { dateToTimestamp } from './utils'
diff --git a/packages/anoncreds/src/models/registry.ts b/packages/anoncreds/src/models/registry.ts
@@ -37,7 +37,7 @@ export interface AnonCredsRevocationRegistryDefinition {
 export interface AnonCredsRevocationStatusList {
   issuerId: string
   revRegDefId: string
-  revocationList: number[]
+  revocationList: Array<number>
   currentAccumulator: string
   timestamp: number
 }
diff --git a/packages/anoncreds/src/services/registry/RevocationRegistryDefinitionOptions.ts b/packages/anoncreds/src/services/registry/RevocationRegistryDefinitionOptions.ts
@@ -4,6 +4,7 @@ import type {
   AnonCredsOperationStateFinished,
   AnonCredsResolutionMetadata,
   Extensible,
+  AnonCredsOperationStateAction,
 } from './base'
 import type { AnonCredsRevocationRegistryDefinition } from '../../models/registry'
 
@@ -19,27 +20,33 @@ export interface RegisterRevocationRegistryDefinitionOptions {
   options: Extensible
 }
 
+export interface RegisterRevocationRegistryDefinitionReturnStateAction extends AnonCredsOperationStateAction {
+  revocationRegistryDefinition: AnonCredsRevocationRegistryDefinition
+  revocationRegistryDefinitionId: string
+}
+
 export interface RegisterRevocationRegistryDefinitionReturnStateFailed extends AnonCredsOperationStateFailed {
   revocationRegistryDefinition?: AnonCredsRevocationRegistryDefinition
   revocationRegistryDefinitionId?: string
 }
 
+export interface RegisterRevocationRegistryDefinitionReturnStateWait extends AnonCredsOperationStateWait {
+  revocationRegistryDefinition?: AnonCredsRevocationRegistryDefinition
+  revocationRegistryDefinitionId?: string
+}
+
 export interface RegisterRevocationRegistryDefinitionReturnStateFinished extends AnonCredsOperationStateFinished {
   revocationRegistryDefinition: AnonCredsRevocationRegistryDefinition
   revocationRegistryDefinitionId: string
 }
 
-export interface RegisterRevocationRegistryDefinitionReturnState extends AnonCredsOperationStateWait {
-  revocationRegistryDefinition?: AnonCredsRevocationRegistryDefinition
-  revocationRegistryDefinitionId?: string
-}
-
 export interface RegisterRevocationRegistryDefinitionReturn {
   jobId?: string
   revocationRegistryDefinitionState:
+    | RegisterRevocationRegistryDefinitionReturnStateWait
+    | RegisterRevocationRegistryDefinitionReturnStateAction
     | RegisterRevocationRegistryDefinitionReturnStateFailed
     | RegisterRevocationRegistryDefinitionReturnStateFinished
-    | RegisterRevocationRegistryDefinitionReturnState
   revocationRegistryDefinitionMetadata: Extensible
   registrationMetadata: Extensible
 }
diff --git a/packages/anoncreds/src/services/registry/RevocationStatusListOptions.ts b/packages/anoncreds/src/services/registry/RevocationStatusListOptions.ts
@@ -4,43 +4,50 @@ import type {
   AnonCredsOperationStateFinished,
   AnonCredsResolutionMetadata,
   Extensible,
+  AnonCredsOperationStateAction,
 } from './base'
 import type { AnonCredsRevocationStatusList } from '../../models/registry'
+import type { Optional } from '@aries-framework/core'
 
 export interface GetRevocationStatusListReturn {
   revocationStatusList?: AnonCredsRevocationStatusList
   resolutionMetadata: AnonCredsResolutionMetadata
   revocationStatusListMetadata: Extensible
 }
 
+// Timestamp is often calculated by the ledger, otherwise method should just take current time
+// Return type does include the timestamp.
+export type AnonCredsRevocationStatusListWithoutTimestamp = Omit<AnonCredsRevocationStatusList, 'timestamp'>
+export type AnonCredsRevocationStatusListWithOptionalTimestamp = Optional<AnonCredsRevocationStatusList, 'timestamp'>
+
 export interface RegisterRevocationStatusListOptions {
-  // Timestamp is often calculated by the ledger, otherwise method should just take current time
-  // Return type does include the timestamp.
-  revocationStatusList: Omit<AnonCredsRevocationStatusList, 'timestamp'>
+  revocationStatusList: AnonCredsRevocationStatusListWithoutTimestamp
   options: Extensible
 }
 
+export interface RegisterRevocationStatusListReturnStateAction extends AnonCredsOperationStateAction {
+  revocationStatusList: AnonCredsRevocationStatusListWithOptionalTimestamp
+}
+
 export interface RegisterRevocationStatusListReturnStateFailed extends AnonCredsOperationStateFailed {
-  revocationStatusList?: AnonCredsRevocationStatusList
-  timestamp?: string
+  revocationStatusList?: AnonCredsRevocationStatusListWithOptionalTimestamp
 }
 
-export interface RegisterRevocationStatusListReturnStateFinished extends AnonCredsOperationStateFinished {
-  revocationStatusList: AnonCredsRevocationStatusList
-  timestamp: string
+export interface RegisterRevocationStatusListReturnStateWait extends AnonCredsOperationStateWait {
+  revocationStatusList?: AnonCredsRevocationStatusListWithOptionalTimestamp
 }
 
-export interface RegisterRevocationStatusListReturnState extends AnonCredsOperationStateWait {
-  revocationStatusList?: AnonCredsRevocationStatusList
-  timestamp?: string
+export interface RegisterRevocationStatusListReturnStateFinished extends AnonCredsOperationStateFinished {
+  revocationStatusList: AnonCredsRevocationStatusList
 }
 
 export interface RegisterRevocationStatusListReturn {
   jobId?: string
   revocationStatusListState:
+    | RegisterRevocationStatusListReturnStateWait
+    | RegisterRevocationStatusListReturnStateAction
     | RegisterRevocationStatusListReturnStateFailed
     | RegisterRevocationStatusListReturnStateFinished
-    | RegisterRevocationStatusListReturnState
   revocationStatusListMetadata: Extensible
   registrationMetadata: Extensible
 }