Skip to content

Commit

Permalink
Add more attribution and trademark info
Browse files Browse the repository at this point in the history
  • Loading branch information
mvdbos committed Nov 9, 2022
1 parent fd0b9e8 commit 4771a58
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
1 change: 1 addition & 0 deletions TRADEMARK
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Corda and the Corda logo are trademarks of R3 HoldCo LLC and its affiliates. All rights reserved.

0 comments on commit 4771a58

Please sign in to comment.