Skip to content

Commit

Permalink
Merge pull request #1284 from decentralized-identity/next
Browse files Browse the repository at this point in the history
chore: next major release
  • Loading branch information
nickreynolds authored Apr 2, 2024
2 parents accfc40 + 1c6627c commit 9d10562
Show file tree
Hide file tree
Showing 138 changed files with 9,989 additions and 18,060 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/build-and-test-on-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8
- run: pnpm add -g pnpm
Expand All @@ -20,7 +20,7 @@ jobs:
- run: pnpm install
- run: pnpm build
- name: 'Save build output'
uses: actions/cache/save@v3
uses: actions/cache/save@v4
with:
path: ${{ github.workspace }}
key: ${{ runner.os }}-build-${{ github.sha }}-${{ github.run_id }}
Expand All @@ -41,12 +41,12 @@ jobs:
- 5432:5432
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
steps:
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8
- run: pnpm add -g pnpm
- name: 'Restore build output'
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
path: ${{ github.workspace }}
key: ${{ runner.os }}-build-${{ github.sha }}-${{ github.run_id }}
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
path: coverage
- name: Merge Code Coverage
run: npx nyc merge coverage/ coverage/coverage-final.json
- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos but sometimes fails without :|
fail_ci_if_error: true
Expand All @@ -93,12 +93,12 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8
- run: pnpm add -g pnpm
- name: 'Restore build output'
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
path: ${{ github.workspace }}
key: ${{ runner.os }}-build-${{ github.sha }}-${{ github.run_id }}
Expand All @@ -118,12 +118,12 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8
- run: pnpm add -g pnpm
- name: 'Restore build output'
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
path: ${{ github.workspace }}
key: ${{ runner.os }}-build-${{ github.sha }}-${{ github.run_id }}
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/build-test-publish-on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
with:
fetch-depth: 0
persist-credentials: false
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8
- run: pnpm add -g pnpm
Expand All @@ -28,7 +28,7 @@ jobs:
- run: pnpm install
- run: pnpm build
- name: 'Save build output'
uses: actions/cache/save@v3
uses: actions/cache/save@v4
with:
path: ${{ github.workspace }}
key: ${{ runner.os }}-build-${{ github.sha }}-${{ github.run_id }}
Expand All @@ -49,12 +49,12 @@ jobs:
- 5432:5432
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
steps:
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8
- run: pnpm add -g pnpm
- name: 'Restore build output'
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
path: ${{ github.workspace }}
key: ${{ runner.os }}-build-${{ github.sha }}-${{ github.run_id }}
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
path: coverage
- name: Merge Code Coverage
run: npx nyc merge coverage/ coverage/coverage-final.json
- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos but sometimes fails without :|
fail_ci_if_error: false
Expand All @@ -102,12 +102,12 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8
- run: pnpm add -g pnpm
- name: 'Restore build output'
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
path: ${{ github.workspace }}
key: ${{ runner.os }}-build-${{ github.sha }}-${{ github.run_id }}
Expand All @@ -127,12 +127,12 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8
- run: pnpm add -g pnpm
- name: 'Restore build output'
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
path: ${{ github.workspace }}
key: ${{ runner.os }}-build-${{ github.sha }}-${{ github.run_id }}
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
with:
fetch-depth: 0
token: ${{secrets.GH_TOKEN}}
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8
- run: pnpm add -g pnpm
Expand All @@ -176,7 +176,7 @@ jobs:
cache: 'pnpm'

- name: 'Restore build output'
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
path: ${{ github.workspace }}
key: ${{ runner.os }}-build-${{ github.sha }}-${{ github.run_id }}
Expand Down
1 change: 1 addition & 0 deletions AWESOME.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Please help us improve the contents or format of this list by creating a pull re
* [BBS+ issuer](https://github.com/pcibraro/veramo-bls-issuer/tree/main)
* [RN app with credential signing](https://github.com/symfoni/identity-wallet)
* [ID Pocket digital identity wallet](https://rktechworks.com/idpocket)
* [Spherity Aries RFCs Veramo Plugin](https://github.com/spherity/aries-rfcs-veramo-plugin)
* add your own project here!

## Disclaimer
Expand Down
15 changes: 11 additions & 4 deletions __tests__/localAgent.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ import {
LdDefaultContexts,
VeramoEcdsaSecp256k1RecoverySignature2020,
VeramoEd25519Signature2018,
VeramoEd25519Signature2020,
VeramoJsonWebSignature2020,
} from '../packages/credential-ld/src'
import { EthrDIDProvider } from '../packages/did-provider-ethr/src'
import { WebDIDProvider } from '../packages/did-provider-web/src'
Expand Down Expand Up @@ -157,7 +159,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
kms: {
local: new KeyManagementSystem(new PrivateKeyStore(dbConnection, new SecretBox(secretKey))),
web3: new Web3KeyManagementSystem({
ethers: ethersProvider,
ethers: ethersProvider as any, // different versions of ethers complain about a type mismatch here
}),
},
}),
Expand Down Expand Up @@ -193,7 +195,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
{
chainId: 1337,
name: 'ganache',
provider,
provider: provider as any, // different versions of ethers complain about a type mismatch here
registry,
},
],
Expand Down Expand Up @@ -245,12 +247,17 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
new SdrMessageHandler(),
],
}),
new DIDComm({ transports: [new DIDCommHttpTransport()]}),
new DIDComm({ transports: [new DIDCommHttpTransport()] }),
new CredentialPlugin(),
new CredentialIssuerEIP712(),
new CredentialIssuerLD({
contextMaps: [LdDefaultContexts, credential_contexts as any],
suites: [new VeramoEcdsaSecp256k1RecoverySignature2020(), new VeramoEd25519Signature2018()],
suites: [
new VeramoEcdsaSecp256k1RecoverySignature2020(),
new VeramoEd25519Signature2018(),
new VeramoJsonWebSignature2020(),
new VeramoEd25519Signature2020(),
],
}),
new SelectiveDisclosure(),
new DIDDiscovery({
Expand Down
13 changes: 10 additions & 3 deletions __tests__/localJsonStoreAgent.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ import {
LdDefaultContexts,
VeramoEcdsaSecp256k1RecoverySignature2020,
VeramoEd25519Signature2018,
VeramoEd25519Signature2020,
VeramoJsonWebSignature2020,
} from '../packages/credential-ld/src'
import { EthrDIDProvider } from '../packages/did-provider-ethr/src'
import { WebDIDProvider } from '../packages/did-provider-web/src'
Expand All @@ -51,7 +53,7 @@ import {
PrivateKeyStoreJson,
} from '../packages/data-store-json/src'
import { FakeDidProvider, FakeDidResolver } from '../packages/test-utils/src'
import { PeerDIDProvider, getResolver as getDidPeerResolver } from '../packages/did-provider-peer/src'
import { getResolver as getDidPeerResolver, PeerDIDProvider } from '../packages/did-provider-peer/src'

import { Resolver } from 'did-resolver'
import { getResolver as ethrDidResolver } from 'ethr-did-resolver'
Expand All @@ -77,7 +79,7 @@ import utils from './shared/utils'
import { JsonFileStore } from './utils/json-file-store'
import credentialStatus from './shared/credentialStatus'
import credentialPluginTests from './shared/credentialPluginTests'
import dbInitOptions from "./shared/dbInitOptions";
import dbInitOptions from './shared/dbInitOptions'

jest.setTimeout(120000)

Expand Down Expand Up @@ -205,7 +207,12 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
new CredentialIssuerEIP712(),
new CredentialIssuerLD({
contextMaps: [LdDefaultContexts, credential_contexts as any],
suites: [new VeramoEcdsaSecp256k1RecoverySignature2020(), new VeramoEd25519Signature2018()],
suites: [
new VeramoEcdsaSecp256k1RecoverySignature2020(),
new VeramoEd25519Signature2018(),
new VeramoEd25519Signature2020(),
new VeramoJsonWebSignature2020(),
],
}),
new SelectiveDisclosure(),
...(options?.plugins || []),
Expand Down
Loading

0 comments on commit 9d10562

Please sign in to comment.