Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into fix/support-all-min…
Browse files Browse the repository at this point in the history
…or-versions-handshake-protocol
  • Loading branch information
TimoGlastra committed Jan 30, 2024
2 parents a58c007 + 1c0e3ce commit 45c53e7
Show file tree
Hide file tree
Showing 443 changed files with 2,654 additions and 1,165 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/continuous-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Get version number
id: get-version
run: |
LAST_RELEASED_VERSION=$(npm view @aries-framework/core@alpha version)
LAST_RELEASED_VERSION=$(npm view @credo-ts/core@alpha version)
echo version="${LAST_RELEASED_VERSION}" >> "$GITHUB_OUTPUT"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
78 changes: 39 additions & 39 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,105 +66,105 @@ Aries Framework JavaScript is a framework written in TypeScript for building **S
<th><b>Version</b></th>
</tr>
<tr>
<td>@aries-framework/core</td>
<td>@credo-ts/core</td>
<td>
<a href="https://npmjs.com/package/@aries-framework/core">
<img alt="@aries-framework/core version" src="https://img.shields.io/npm/v/@aries-framework/core"/>
<a href="https://npmjs.com/package/@credo-ts/core">
<img alt="@credo-ts/core version" src="https://img.shields.io/npm/v/@credo-ts/core"/>
</a>
</td>
</tr>
<tr>
<td>@aries-framework/node</td>
<td>@credo-ts/node</td>
<td>
<a href="https://npmjs.com/package/@aries-framework/node">
<img alt="@aries-framework/node version" src="https://img.shields.io/npm/v/@aries-framework/node"/>
<a href="https://npmjs.com/package/@credo-ts/node">
<img alt="@credo-ts/node version" src="https://img.shields.io/npm/v/@credo-ts/node"/>
</a>
</td>
</tr>
<tr>
<td>@aries-framework/react-native</td>
<td>@credo-ts/react-native</td>
<td>
<a href="https://npmjs.com/package/@aries-framework/react-native">
<img alt="@aries-framework/react-native version" src="https://img.shields.io/npm/v/@aries-framework/react-native"/>
<a href="https://npmjs.com/package/@credo-ts/react-native">
<img alt="@credo-ts/react-native version" src="https://img.shields.io/npm/v/@credo-ts/react-native"/>
</a>
</td>
</tr>
<tr>
<td>@aries-framework/indy-sdk</td>
<td>@credo-ts/indy-sdk</td>
<td>
<a href="https://npmjs.com/package/@aries-framework/indy-sdk">
<img alt="@aries-framework/indy-sdk version" src="https://img.shields.io/npm/v/@aries-framework/indy-sdk"/>
<a href="https://npmjs.com/package/@credo-ts/indy-sdk">
<img alt="@credo-ts/indy-sdk version" src="https://img.shields.io/npm/v/@credo-ts/indy-sdk"/>
</a>
</td>
</tr>
<tr>
<td>@aries-framework/indy-vdr</td>
<td>@credo-ts/indy-vdr</td>
<td>
<a href="https://npmjs.com/package/@aries-framework/indy-vdr">
<img alt="@aries-framework/indy-vdr version" src="https://img.shields.io/npm/v/@aries-framework/indy-vdr"/>
<a href="https://npmjs.com/package/@credo-ts/indy-vdr">
<img alt="@credo-ts/indy-vdr version" src="https://img.shields.io/npm/v/@credo-ts/indy-vdr"/>
</a>
</td>
</tr>
<tr>
<td>@aries-framework/cheqd</td>
<td>@credo-ts/cheqd</td>
<td>
<a href="https://npmjs.com/package/@aries-framework/cheqd">
<img alt="@aries-framework/cheqd version" src="https://img.shields.io/npm/v/@aries-framework/cheqd"/>
<a href="https://npmjs.com/package/@credo-ts/cheqd">
<img alt="@credo-ts/cheqd version" src="https://img.shields.io/npm/v/@credo-ts/cheqd"/>
</a>
</td>
</tr>
<tr>
<td>@aries-framework/askar</td>
<td>@credo-ts/askar</td>
<td>
<a href="https://npmjs.com/package/@aries-framework/askar">
<img alt="@aries-framework/askar version" src="https://img.shields.io/npm/v/@aries-framework/askar"/>
<a href="https://npmjs.com/package/@credo-ts/askar">
<img alt="@credo-ts/askar version" src="https://img.shields.io/npm/v/@credo-ts/askar"/>
</a>
</td>
</tr>
<tr>
<td>@aries-framework/anoncreds</td>
<td>@credo-ts/anoncreds</td>
<td>
<a href="https://npmjs.com/package/@aries-framework/anoncreds">
<img alt="@aries-framework/anoncreds version" src="https://img.shields.io/npm/v/@aries-framework/anoncreds"/>
<a href="https://npmjs.com/package/@credo-ts/anoncreds">
<img alt="@credo-ts/anoncreds version" src="https://img.shields.io/npm/v/@credo-ts/anoncreds"/>
</a>
</td>
</tr>
<tr>
<td>@aries-framework/anoncreds-rs</td>
<td>@credo-ts/anoncreds-rs</td>
<td>
<a href="https://npmjs.com/package/@aries-framework/anoncreds-rs">
<img alt="@aries-framework/anoncreds-rs version" src="https://img.shields.io/npm/v/@aries-framework/anoncreds-rs"/>
<a href="https://npmjs.com/package/@credo-ts/anoncreds-rs">
<img alt="@credo-ts/anoncreds-rs version" src="https://img.shields.io/npm/v/@credo-ts/anoncreds-rs"/>
</a>
</td>
</tr>
<tr>
<td>@aries-framework/openid4vc-client</td>
<td>@credo-ts/openid4vc-client</td>
<td>
<a href="https://npmjs.com/package/@aries-framework/openid4vc-client">
<img alt="@aries-framework/openid4vc-client version" src="https://img.shields.io/npm/v/@aries-framework/openid4vc-client"/>
<a href="https://npmjs.com/package/@credo-ts/openid4vc-client">
<img alt="@credo-ts/openid4vc-client version" src="https://img.shields.io/npm/v/@credo-ts/openid4vc-client"/>
</a>
</td>
</tr>
<tr>
<td>@aries-framework/action-menu</td>
<td>@credo-ts/action-menu</td>
<td>
<a href="https://npmjs.com/package/@aries-framework/action-menu">
<img alt="@aries-framework/action-menu version" src="https://img.shields.io/npm/v/@aries-framework/action-menu"/>
<a href="https://npmjs.com/package/@credo-ts/action-menu">
<img alt="@credo-ts/action-menu version" src="https://img.shields.io/npm/v/@credo-ts/action-menu"/>
</a>
</td>
</tr>
<td>@aries-framework/question-answer</td>
<td>@credo-ts/question-answer</td>
<td>
<a href="https://npmjs.com/package/@aries-framework/question-answer">
<img alt="@aries-framework/question-answer version" src="https://img.shields.io/npm/v/@aries-framework/question-answer"/>
<a href="https://npmjs.com/package/@credo-ts/question-answer">
<img alt="@credo-ts/question-answer version" src="https://img.shields.io/npm/v/@credo-ts/question-answer"/>
</a>
</td>
</tr>
<tr>
<td>@aries-framework/tenants</td>
<td>@credo-ts/tenants</td>
<td>
<a href="https://npmjs.com/package/@aries-framework/tenants">
<img alt="@aries-framework/tenants version" src="https://img.shields.io/npm/v/@aries-framework/tenants"/>
<a href="https://npmjs.com/package/@credo-ts/tenants">
<img alt="@credo-ts/tenants version" src="https://img.shields.io/npm/v/@credo-ts/tenants"/>
</a>
</td>
</tr>
Expand Down
16 changes: 8 additions & 8 deletions demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
"inquirer": "^8.2.5"
},
"devDependencies": {
"@aries-framework/anoncreds": "*",
"@aries-framework/anoncreds-rs": "*",
"@aries-framework/askar": "*",
"@aries-framework/core": "*",
"@aries-framework/indy-sdk": "*",
"@aries-framework/indy-vdr": "*",
"@aries-framework/cheqd": "*",
"@aries-framework/node": "*",
"@credo-ts/anoncreds": "*",
"@credo-ts/anoncreds-rs": "*",
"@credo-ts/askar": "*",
"@credo-ts/core": "*",
"@credo-ts/indy-sdk": "*",
"@credo-ts/indy-vdr": "*",
"@credo-ts/cheqd": "*",
"@credo-ts/node": "*",
"@types/figlet": "^1.5.4",
"@types/indy-sdk": "^1.16.26",
"@types/inquirer": "^8.2.6",
Expand Down
2 changes: 1 addition & 1 deletion demo/src/Alice.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ConnectionRecord, CredentialExchangeRecord, ProofExchangeRecord } from '@aries-framework/core'
import type { ConnectionRecord, CredentialExchangeRecord, ProofExchangeRecord } from '@credo-ts/core'

import { BaseAgent } from './BaseAgent'
import { greenText, Output, redText } from './OutputClass'
Expand Down
2 changes: 1 addition & 1 deletion demo/src/AliceInquirer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { CredentialExchangeRecord, ProofExchangeRecord } from '@aries-framework/core'
import type { CredentialExchangeRecord, ProofExchangeRecord } from '@credo-ts/core'

import { clear } from 'console'
import { textSync } from 'figlet'
Expand Down
22 changes: 11 additions & 11 deletions demo/src/BaseAgent.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { InitConfig } from '@aries-framework/core'
import type { IndySdkPoolConfig } from '@aries-framework/indy-sdk'
import type { IndyVdrPoolConfig } from '@aries-framework/indy-vdr'
import type { InitConfig } from '@credo-ts/core'
import type { IndySdkPoolConfig } from '@credo-ts/indy-sdk'
import type { IndyVdrPoolConfig } from '@credo-ts/indy-vdr'

import {
AnonCredsCredentialFormatService,
Expand All @@ -10,16 +10,16 @@ import {
LegacyIndyProofFormatService,
V1CredentialProtocol,
V1ProofProtocol,
} from '@aries-framework/anoncreds'
import { AnonCredsRsModule } from '@aries-framework/anoncreds-rs'
import { AskarModule } from '@aries-framework/askar'
} from '@credo-ts/anoncreds'
import { AnonCredsRsModule } from '@credo-ts/anoncreds-rs'
import { AskarModule } from '@credo-ts/askar'
import {
CheqdAnonCredsRegistry,
CheqdDidRegistrar,
CheqdDidResolver,
CheqdModule,
CheqdModuleConfig,
} from '@aries-framework/cheqd'
} from '@credo-ts/cheqd'
import {
ConnectionsModule,
DidsModule,
Expand All @@ -31,10 +31,10 @@ import {
CredentialsModule,
Agent,
HttpOutboundTransport,
} from '@aries-framework/core'
import { IndySdkAnonCredsRegistry, IndySdkModule, IndySdkSovDidResolver } from '@aries-framework/indy-sdk'
import { IndyVdrIndyDidResolver, IndyVdrAnonCredsRegistry, IndyVdrModule } from '@aries-framework/indy-vdr'
import { agentDependencies, HttpInboundTransport } from '@aries-framework/node'
} from '@credo-ts/core'
import { IndySdkAnonCredsRegistry, IndySdkModule, IndySdkSovDidResolver } from '@credo-ts/indy-sdk'
import { IndyVdrIndyDidResolver, IndyVdrAnonCredsRegistry, IndyVdrModule } from '@credo-ts/indy-vdr'
import { agentDependencies, HttpInboundTransport } from '@credo-ts/node'
import { anoncreds } from '@hyperledger/anoncreds-nodejs'
import { ariesAskar } from '@hyperledger/aries-askar-nodejs'
import { indyVdr } from '@hyperledger/indy-vdr-nodejs'
Expand Down
11 changes: 4 additions & 7 deletions demo/src/Faber.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import type { RegisterCredentialDefinitionReturnStateFinished } from '@aries-framework/anoncreds'
import type { ConnectionRecord, ConnectionStateChangedEvent } from '@aries-framework/core'
import type {
IndyVdrRegisterSchemaOptions,
IndyVdrRegisterCredentialDefinitionOptions,
} from '@aries-framework/indy-vdr'
import type { RegisterCredentialDefinitionReturnStateFinished } from '@credo-ts/anoncreds'
import type { ConnectionRecord, ConnectionStateChangedEvent } from '@credo-ts/core'
import type { IndyVdrRegisterSchemaOptions, IndyVdrRegisterCredentialDefinitionOptions } from '@credo-ts/indy-vdr'
import type BottomBar from 'inquirer/lib/ui/bottom-bar'

import { ConnectionEventTypes, KeyType, TypedArrayEncoder, utils } from '@aries-framework/core'
import { ConnectionEventTypes, KeyType, TypedArrayEncoder, utils } from '@credo-ts/core'
import { ui } from 'inquirer'

import { BaseAgent, indyNetworkConfig } from './BaseAgent'
Expand Down
4 changes: 2 additions & 2 deletions demo/src/Listener.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import type {
CredentialStateChangedEvent,
ProofExchangeRecord,
ProofStateChangedEvent,
} from '@aries-framework/core'
} from '@credo-ts/core'
import type BottomBar from 'inquirer/lib/ui/bottom-bar'

import {
Expand All @@ -19,7 +19,7 @@ import {
CredentialState,
ProofEventTypes,
ProofState,
} from '@aries-framework/core'
} from '@credo-ts/core'
import { ui } from 'inquirer'

import { Color, purpleText } from './OutputClass'
Expand Down
6 changes: 1 addition & 5 deletions jest.config.base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ const config: Config.InitialOptions = {
testEnvironment: 'node',
testMatch: ['**/?(*.)+(spec|test).[tj]s?(x)'],
moduleNameMapper: {
'@aries-framework/(.+)': [
'<rootDir>/../../packages/$1/src',
'<rootDir>/../packages/$1/src',
'<rootDir>/packages/$1/src',
],
'@credo-ts/(.+)': ['<rootDir>/../../packages/$1/src', '<rootDir>/../packages/$1/src', '<rootDir>/packages/$1/src'],
},
transform: {
'^.+\\.tsx?$': [
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "aries-framework",
"name": "credo-ts",
"private": true,
"license": "Apache-2.0",
"workspaces": [
Expand Down
6 changes: 3 additions & 3 deletions packages/action-menu/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline

## [0.4.2](https://github.com/hyperledger/aries-framework-javascript/compare/v0.4.1...v0.4.2) (2023-10-05)

**Note:** Version bump only for package @aries-framework/action-menu
**Note:** Version bump only for package @credo-ts/action-menu

## [0.4.1](https://github.com/hyperledger/aries-framework-javascript/compare/v0.4.0...v0.4.1) (2023-08-28)

Expand Down Expand Up @@ -45,11 +45,11 @@ Signed-off-by: Ariel Gentile <gentilester@gmail.com>

## [0.3.2](https://github.com/hyperledger/aries-framework-javascript/compare/v0.3.1...v0.3.2) (2023-01-04)

**Note:** Version bump only for package @aries-framework/action-menu
**Note:** Version bump only for package @credo-ts/action-menu

## [0.3.1](https://github.com/hyperledger/aries-framework-javascript/compare/v0.3.0...v0.3.1) (2022-12-27)

**Note:** Version bump only for package @aries-framework/action-menu
**Note:** Version bump only for package @credo-ts/action-menu

# [0.3.0](https://github.com/hyperledger/aries-framework-javascript/compare/v0.2.5...v0.3.0) (2022-12-22)

Expand Down
14 changes: 7 additions & 7 deletions packages/action-menu/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
alt="typescript"
src="https://img.shields.io/badge/%3C%2F%3E-TypeScript-%230074c1.svg"
/></a>
<a href="https://www.npmjs.com/package/@aries-framework/action-menu"
<a href="https://www.npmjs.com/package/@credo-ts/action-menu"
><img
alt="@aries-framework/action-menu version"
src="https://img.shields.io/npm/v/@aries-framework/action-menu"
alt="@credo-ts/action-menu version"
src="https://img.shields.io/npm/v/@credo-ts/action-menu"
/></a>

</p>
Expand All @@ -32,16 +32,16 @@ Action Menu module for [Aries Framework JavaScript](https://github.com/hyperledg

### Installation

Make sure you have set up the correct version of Aries Framework JavaScript according to the AFJ repository. To find out which version of AFJ you need to have installed you can run the following command. This will list the required peer dependency for `@aries-framework/core`.
Make sure you have set up the correct version of Aries Framework JavaScript according to the AFJ repository. To find out which version of AFJ you need to have installed you can run the following command. This will list the required peer dependency for `@credo-ts/core`.

```sh
npm info "@aries-framework/action-menu" peerDependencies
npm info "@credo-ts/action-menu" peerDependencies
```

Then add the action-menu module to your project.

```sh
yarn add @aries-framework/action-menu
yarn add @credo-ts/action-menu
```

### Quick start
Expand All @@ -51,7 +51,7 @@ In order for this module to work, we have to inject it into the agent to access
### Example of usage

```ts
import { ActionMenuModule } from '@aries-framework/action-menu'
import { ActionMenuModule } from '@credo-ts/action-menu'

const agent = new Agent({
config: {
Expand Down
4 changes: 2 additions & 2 deletions packages/action-menu/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@aries-framework/action-menu",
"name": "@credo-ts/action-menu",
"main": "build/index",
"types": "build/index",
"version": "0.4.2",
Expand All @@ -24,7 +24,7 @@
"test": "jest"
},
"dependencies": {
"@aries-framework/core": "0.4.2",
"@credo-ts/core": "0.4.2",
"class-transformer": "0.5.1",
"class-validator": "0.14.0",
"rxjs": "^7.2.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/action-menu/src/ActionMenuApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
MessageSender,
injectable,
getOutboundMessageContext,
} from '@aries-framework/core'
} from '@credo-ts/core'

import { ActionMenuRole } from './ActionMenuRole'
import {
Expand Down
2 changes: 1 addition & 1 deletion packages/action-menu/src/ActionMenuEvents.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { ActionMenuState } from './ActionMenuState'
import type { ActionMenuRecord } from './repository'
import type { BaseEvent } from '@aries-framework/core'
import type { BaseEvent } from '@credo-ts/core'

/**
* @public
Expand Down
Loading

0 comments on commit 45c53e7

Please sign in to comment.