From 4771a58aeb66486311d7f7f1d25981024221f0db Mon Sep 17 00:00:00 2001 From: Matthijs van den Bos Date: Wed, 9 Nov 2022 15:33:05 +0100 Subject: [PATCH] Add more attribution and trademark info --- LICENSE | 2 +- README.md | 10 ++++++++-- TRADEMARK | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 TRADEMARK diff --git a/LICENSE b/LICENSE index e0840a446..11737146c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2007 Mockito contributors +Copyright (c) 2022 ING Bank N.V. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index e029c3171..e2f7fd020 100644 --- a/README.md +++ b/README.md @@ -68,12 +68,14 @@ This project requires Java 8. To be consistent with our CI, it is advisable to u On Mac, that is very easy to install and manage with [SDKMAN](https://sdkman.io/). ### Zinc +Zinc is the ZKP toolchain used under the hood by ZKFlow. It is created by [Matter Labs](https://matter-labs.io/). +Zinc was forked for ZKFlow to enable a few new features. -You need to build and install our fork of Zinc from the [Github](https://dev.azure.com/INGNeo/ING%20Neo%20-%20ZKFlow/_git/zinc). +You need to build and install the ZKFlow fork of Zinc from [Github](https://github.com/mvdbos/zinc). Please make sure you have a recent version of Rust installed before building Zinc. ```bash -$ git clone https://dev.azure.com/INGNeo/ING%20Neo%20-%20ZKFlow/_git/zinc +$ git clone https://github.com/mvdbos/zinc $ cd zinc $ git checkout ing-fork $ cargo b --release @@ -84,3 +86,7 @@ Built binaries will be stored in `./target/release`. Move the `zargo`, `znc` and ## Contributing to ZKFlow If you want to make changes to ZKFlow, great! We welcome pull requests at any time. If you decide to create a PR, please keep the [contributing guidelines](CONTRIBUTING.md) in mind. + +## License + +[MIT](./LICENSE) diff --git a/TRADEMARK b/TRADEMARK new file mode 100644 index 000000000..06e4073dc --- /dev/null +++ b/TRADEMARK @@ -0,0 +1 @@ +Corda and the Corda logo are trademarks of R3 HoldCo LLC and its affiliates. All rights reserved. \ No newline at end of file