Skip to content
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
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ $(eval $(call makemock, pkg/dataexchange, Plugin, dataexchangem
$(eval $(call makemock, pkg/dataexchange, Callbacks, dataexchangemocks))
$(eval $(call makemock, pkg/tokens, Plugin, tokenmocks))
$(eval $(call makemock, pkg/tokens, Callbacks, tokenmocks))
$(eval $(call makemock, internal/identity, Manager, identitymanagermocks))
$(eval $(call makemock, internal/batchpin, Submitter, batchpinmocks))
$(eval $(call makemock, internal/sysmessaging, SystemEvents, sysmessagingmocks))
$(eval $(call makemock, internal/syncasync, Bridge, syncasyncmocks))
Expand Down
19 changes: 10 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,12 @@ It depends on the following Kaleido services:
│ │ │ │ * Hashes data, and maintains mapping to payload references in blob storage
│ │ └───────────────┘ * Integrates with blockchain interface [Bi] plugin
│ │
│ │ ┌───────────────┐
│ ├───┤ identity [Im] │ - Central identity management service across components
│ │ │ manager │ * Resolves API input identity + key combos (short names, formatting etc.)
│ │ │ │ * Resolves registered on-chain signing keys back to identities
│ │ └───────────────┘ * Integrates with Blockchain Interface and plugable Identity Interface (TBD)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤩

│ │
│ │ ┌───────────────┐ - Private data management and validation
│ ├───┤ event [Em]│ * Implements dispatcher for batch component
│ │ │ manager │ * Integrates with data exchange [Dx] plugin
Expand Down Expand Up @@ -269,15 +275,10 @@ Plugins: Each plugin comprises a Go shim, plus a remote agent microservice runti
│ │ httpdirect │ │ kaleido │
│ └───────────────┘ └───────────────┘
│ ┌───────────────┐ - Identity resolution and mapping
├───────────┤ identity [Ii]│ * Resolves opaque identifiers used throughout FireFly
│ │ interface │ * Maps to and from blockchain signing identities
│ └─────┬─────────┘ * Map API/user identities from authentication, to network/organizational identities
│ │
│ ├───────────── ... extensible to DIDs etc.
│ ┌─────┴─────────┐
│ │ onchain │
│ └───────────────┘
│ ┌───────────────┐ - Pluggable identity infrastructure
├───────────┤ identity [Ii]│ * TBD
│ │ interface │ * See Identity Manager component above
│ └───────────────┘ * See Issue
│ ┌───────────────┐ - API Authentication and Authorization Interface
├───────────┤ api auth [Aa]│ * Authenticates security credentials (OpenID Connect id token JWTs etc.)
Expand Down
5 changes: 5 additions & 0 deletions db/migrations/postgres/000030_create_key_fields.down.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
BEGIN;
ALTER TABLE batches DROP COLUMN "key";
ALTER TABLE messages DROP COLUMN "key";
ALTER TABLE tokenpool DROP COLUMN "key";
COMMIT;
15 changes: 15 additions & 0 deletions db/migrations/postgres/000030_create_key_fields.up.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
BEGIN;

ALTER TABLE batches ADD "key" VARCHAR(1024);
UPDATE batches SET "key" = '';
ALTER TABLE batches ALTER COLUMN "key" SET NOT NULL;

ALTER TABLE messages ADD "key" VARCHAR(1024);
UPDATE messages SET "key" = '';
ALTER TABLE messages ALTER COLUMN "key" SET NOT NULL;

ALTER TABLE tokenpool ADD "key" VARCHAR(1024);
UPDATE tokenpool SET "key" = '';
ALTER TABLE tokenpool ALTER COLUMN "key" SET NOT NULL;

COMMIT;
3 changes: 3 additions & 0 deletions db/migrations/sqlite/000030_create_key_fields.down.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ALTER TABLE batches DROP COLUMN "key";
ALTER TABLE messages DROP COLUMN "key";
ALTER TABLE tokenpool DROP COLUMN "key";
8 changes: 8 additions & 0 deletions db/migrations/sqlite/000030_create_key_fields.up.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ALTER TABLE batches ADD COLUMN "key" VARCHAR(1024);
UPDATE batches SET "key" = '';

ALTER TABLE messages ADD COLUMN "key" VARCHAR(1024);
UPDATE messages SET "key" = '';

ALTER TABLE tokenpool ADD COLUMN "key" VARCHAR(1024);
UPDATE tokenpool SET "key" = '';
1 change: 0 additions & 1 deletion docs/contributors/code_overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ A few highlights:
- Better search, filter and query support

## Directories

- [internal](https://github.com/hyperledger/firefly/tree/main/internal): The core Golang implementation code
- [pkg](https://github.com/hyperledger/firefly/tree/main/pkg): Interfaces intended for external project use
- [cmd](https://github.com/hyperledger/firefly/tree/main/cmd): The command line entry point
Expand Down
Loading