Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce accumulatorVersions, add unified addAccumulator and updateAccumulator methods #514

Merged
merged 19 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions examples/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# @docknetwork/sdk-examples

## 0.17.0

### Minor Changes

- Introduce `accumulatorVersions`, add unified `addAccumulator` and `updateAccumulator` methods'

### Patch Changes

- Updated dependencies
- @docknetwork/[email protected]
- @docknetwork/[email protected]
- @docknetwork/[email protected]

## 0.16.1

### Patch Changes
Expand Down
8 changes: 4 additions & 4 deletions examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@docknetwork/sdk-examples",
"private": true,
"type": "module",
"version": "0.16.1",
"version": "0.17.0",
"scripts": {
"bbs-dock-example": "babel-node ./bbs-dock.js",
"claim-deduction-example": "babel-node ./claim-deduction.js",
Expand All @@ -19,9 +19,9 @@
"lint": "eslint \"*.js\""
},
"dependencies": {
"@docknetwork/credential-sdk": "0.34.0",
"@docknetwork/dock-blockchain-api": "0.18.1",
"@docknetwork/dock-blockchain-modules": "0.23.0"
"@docknetwork/credential-sdk": "0.35.0",
"@docknetwork/dock-blockchain-api": "0.19.0",
"@docknetwork/dock-blockchain-modules": "0.24.0"
},
"devDependencies": {
"babel-eslint": "^10.1.0",
Expand Down
11 changes: 11 additions & 0 deletions packages/cheqd-blockchain-api/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @docknetwork/cheqd-blockchain-api

## 0.28.0

### Minor Changes

- Introduce `accumulatorVersions`, add unified `addAccumulator` and `updateAccumulator` methods'

### Patch Changes

- Updated dependencies
- @docknetwork/[email protected]

## 0.27.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/cheqd-blockchain-api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@docknetwork/cheqd-blockchain-api",
"version": "0.27.1",
"version": "0.28.0",
"license": "MIT",
"main": "./dist/esm/index.js",
"type": "module",
Expand Down Expand Up @@ -34,7 +34,7 @@
},
"dependencies": {
"@cheqd/sdk": "cjs",
"@docknetwork/credential-sdk": "0.34.0"
"@docknetwork/credential-sdk": "0.35.0"
},
"devDependencies": {
"@babel/cli": "^7.24.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/cheqd-blockchain-api/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,9 @@ export class CheqdAPI extends AbstractApiProvider {

// Dock identifiers
if (id instanceof NamespaceDid) {
return id.isDock || id.isDidMethodKey;
return id.isDock;
} else if (id instanceof DockDidOrDidMethodKey) {
return true;
return id.isDock;
} else if (id instanceof DidRef) {
return this.supportsIdentifier(id[0]);
} else if (id instanceof TypedEnum) {
Expand Down
11 changes: 11 additions & 0 deletions packages/cheqd-blockchain-modules/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @docknetwork/cheqd-blockchain-modules

## 0.27.0

### Minor Changes

- Introduce `accumulatorVersions`, add unified `addAccumulator` and `updateAccumulator` methods'

### Patch Changes

- Updated dependencies
- @docknetwork/[email protected]

## 0.26.0

### Minor Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/cheqd-blockchain-modules/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@docknetwork/cheqd-blockchain-modules",
"version": "0.26.0",
"version": "0.27.0",
"type": "module",
"license": "MIT",
"main": "./dist/esm/index.js",
Expand Down Expand Up @@ -33,7 +33,7 @@
"node": ">=18.0.0"
},
"dependencies": {
"@docknetwork/credential-sdk": "0.34.0"
"@docknetwork/credential-sdk": "0.35.0"
},
"devDependencies": {
"@babel/cli": "^7.24.1",
Expand All @@ -42,7 +42,7 @@
"@babel/plugin-syntax-import-attributes": "^7.25.6",
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
"@babel/preset-env": "^7.24.3",
"@docknetwork/cheqd-blockchain-api": "0.27.1",
"@docknetwork/cheqd-blockchain-api": "0.28.0",
"@rollup/plugin-alias": "^4.0.2",
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-commonjs": "^24.0.0",
Expand Down
43 changes: 19 additions & 24 deletions packages/cheqd-blockchain-modules/src/accumulator/internal.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,21 @@ export default class CheqdInternalAccumulatorModule extends injectParams(
return (meta) => meta.resourceType === 'accumulator' && meta.name === strName;
}

async accumulatorHistory(accumulatorId) {
async accumulatorVersions(accumulatorId) {
const [did, name] = this.types.AccumulatorId.from(accumulatorId).value;

const ids = new SortedResourceVersions(
return new SortedResourceVersions(
await this.resourcesMetadataBy(
did,
this.createAccumulatorMetadataFilter(name),
),
).ids();
}

async accumulatorHistory(accumulatorId) {
const [did, name] = this.types.AccumulatorId.from(accumulatorId).value;

const ids = await this.accumulatorVersions(accumulatorId);
if (!ids.length) {
return null;
}
Expand All @@ -177,9 +183,7 @@ export default class CheqdInternalAccumulatorModule extends injectParams(
witnessUpdateInfo,
);

const accumulators = resources.map((acc) => CheqdStoredAccumulator.from(
JSON.parse(u8aToString(validateResource(acc, String(name), Type))),
));
const accumulators = resources.map((acc) => CheqdStoredAccumulator.from(validateResource(acc, String(name), Type)));
const updates = accumulators.slice(1).map(mapUpdate);

return new CheqdAccumulatorHistory(
Expand All @@ -203,13 +207,11 @@ export default class CheqdInternalAccumulatorModule extends injectParams(
}

async accumulator(accumulatorId) {
const [did, name] = this.types.AccumulatorId.from(accumulatorId).value;
const ids = new SortedResourceVersions(
await this.resourcesMetadataBy(
did,
this.createAccumulatorMetadataFilter(name),
),
).ids();
const accId = this.types.AccumulatorId.from(accumulatorId);
const ids = await this.accumulatorVersions(accId);
const {
value: [did, name],
} = accId;

if (!ids.length) {
return null;
Expand Down Expand Up @@ -277,26 +279,23 @@ export default class CheqdInternalAccumulatorModule extends injectParams(
const startUUID = String(TypedUUID.from(start));
const endUUID = String(TypedUUID.from(end));

const sortedIDs = new SortedResourceVersions(
await this.resourcesMetadataBy(
did,
this.createAccumulatorMetadataFilter(name),
),
).ids();
const sortedIDs = await this.accumulatorVersions(accumulatorId);

const startIdx = sortedIDs.findIndex((id) => id === startUUID);
let startIdx = sortedIDs.findIndex((id) => id === startUUID);
if (startIdx === -1) {
throw new Error(
`Accumulator \`${accumulatorId}\` with version \`${startUUID}\` doesn't exist`,
);
} else if (startIdx === 0) {
startIdx = 1;
}
let endIdx;
if (end != null) {
endIdx = sortedIDs.findIndex((id) => id === endUUID);

if (endIdx === -1) {
throw new Error(
`Accumulator \`${accumulatorId}\` with version \`${end}\` doesn't exist`,
`Accumulator \`${accumulatorId}\` with version \`${endUUID}\` doesn't exist`,
);
}
} else {
Expand All @@ -312,10 +311,6 @@ export default class CheqdInternalAccumulatorModule extends injectParams(
const { additions, removals, witnessUpdateInfo } = CheqdStoredAccumulator.from(
validateResource(accumulator, String(name), Type),
);
if (witnessUpdateInfo == null) {
// eslint-disable-next-line no-continue
continue;
}

witness.updateUsingPublicInfoPostBatchUpdate(
member,
Expand Down
Loading
Loading