Commit Graph

2020 Commits

Author SHA1 Message Date
Jonathan Locke
122bf3b3e0 Merge OS 4.1 into OS 4.3
Corrected changelog
Corrected irs-demo cordapp build.gradle file - removed unnecessary dependency

feel free to be detailed.
2019-08-27 16:21:47 +01:00
Jonathan Locke
9661f8d4e4 Merge OS 4.1 into OS 4.3
Fixed missed conflict in conf.py
2019-08-27 14:56:08 +01:00
Jonathan Locke
e5f314ffbf Merge branch 'release/4' into jlocke/merge_4.1_20190827
Merged release/4 (Corda OS version 4.1) into a branch created from master (Corda OS version 4.3)

Conflicts:
	build.gradle
	client/rpc/src/main/kotlin/net/corda/client/rpc/internal/ReconnectingCordaRPCOps.kt
	common/logging/build.gradle
	common/logging/src/main/kotlin/net/corda/common/logging/CordaVersion.kt
	constants.properties
	core-tests/src/test/kotlin/net/corda/coretests/utilities/ProgressTrackerTest.kt
	core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
	docs/source/api-contract-constraints.rst
	docs/source/api-stability-guarantees.rst
	docs/source/app-upgrade-notes.rst
	docs/source/changelog.rst
	docs/source/clientrpc.rst
	docs/source/conf.py
	docs/source/corda-network/UAT.md
	docs/source/getting-set-up.rst
	docs/source/network-builder.rst
	docs/source/upgrading-cordapps.rst
	docs/source/versioning.rst
	node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcReconnectTests.kt
	serialization/src/main/kotlin/net/corda/serialization/internal/amqp/PropertyDescriptor.kt
	serialization/src/main/kotlin/net/corda/serialization/internal/model/LocalTypeInformationBuilder.kt
	tools/network-builder/src/main/resources/node-Dockerfile
	tools/network-builder/src/main/resources/notary-Dockerfile
2019-08-27 14:51:22 +01:00
edward-prosser
fc5cd62e20
Merge pull request #5374 from corda/edp-update-qs-bug
CORDA-3150 Docs command fix
2019-08-27 09:20:36 +01:00
Mike Hearn
dbce25b575 Put missing content back into the toctree after a bad merge.
Fix a bunch of ReST markup errors.
2019-08-23 14:41:32 +02:00
Mike Hearn
2dd1e21404 Make the start page a bit nicer and make the white papers more visible. 2019-08-22 19:19:27 +02:00
Mike Hearn
a41ffe7f39 TWP: Last touches of paint on our beautiful new bike shed. 2019-08-22 19:09:43 +02:00
Mike Hearn
929ac26a84 TWP: Rerender. 2019-08-22 19:09:43 +02:00
Mike Hearn
8b662ef0de TWP: Address review comments from Nick Rogers. 2019-08-22 19:09:43 +02:00
Mike Hearn
db83a56c66 TWP: Rerender 2019-08-22 19:09:43 +02:00
Mike Hearn
70c5d96de7 TWP: Address final comments. 2019-08-22 19:09:43 +02:00
Mike Hearn
da18eae303 TWP: Add a section on micronodes, rewrite the accounts section. 2019-08-22 19:09:43 +02:00
Mike Hearn
a88645ee95 TWP: Adjust the section on secure signing devices to more clearly discuss employees. 2019-08-22 19:09:43 +02:00
Mike Hearn
54eef09b6e TWP: Rerender. 2019-08-22 19:09:43 +02:00
Mike Hearn
a1ed695664 TWP: Address review from Jose. 2019-08-22 19:09:43 +02:00
Mike Hearn
d969487805 TWP: Refresh tokens diagram with latest from Roger. 2019-08-22 19:09:43 +02:00
Mike Hearn
32ad2d0a55 TWP: Rerender 2019-08-22 19:09:42 +02:00
Mike Hearn
1b97fd001b TWP: Add changelog entry. 2019-08-22 19:09:42 +02:00
Mike Hearn
51f1530db3 TWP: Cite DTCC study 2019-08-22 19:09:42 +02:00
Mike Hearn
1c802daf21 TWP: Add a brief mention of business networks. 2019-08-22 19:09:42 +02:00
Mike Hearn
df4548264f TWP: Small improvements to the privacy section. 2019-08-22 19:09:42 +02:00
Mike Hearn
8e911e8e49 TWP: Rebrand SGX execution models. 2019-08-22 19:09:42 +02:00
Mike Hearn
877966ac47 TWP: Extend the discussion of scalability. 2019-08-22 19:09:42 +02:00
Mike Hearn
f1011b3e4e TWP: Fix Ref.bib 2019-08-22 19:09:42 +02:00
Mike Hearn
6b0aad3d7f TWP: Add a brief discussion of human interaction to 'future work' 2019-08-22 19:09:42 +02:00
Mike Hearn
8f62c24400 TWP: Move notary "guaranteed data distribution" into the future work section. 2019-08-22 19:09:42 +02:00
Mike Hearn
1e686ca7f3 TWP: Create a top level section "the node", add some more explanations and move some other sections underneath it. 2019-08-22 19:09:42 +02:00
Mike Hearn
d2e851fc06 TWP: Comment out the network merging section until the details are more thoroughly explored. 2019-08-22 19:09:42 +02:00
Mike Hearn
9189ccf066 TWP: A brief note on multiple trust roots. 2019-08-22 19:09:42 +02:00
Mike Hearn
226caee9ab TWP: Address review comments. 2019-08-22 19:09:42 +02:00
Mike Hearn
6fca7a190a TWP: Add a discussion of SGX and the two different security models we are implementing. 2019-08-22 19:09:41 +02:00
Mike Hearn
3f070e4dc3 TWP: Add a section to 'future work' on data streams. 2019-08-22 19:09:41 +02:00
Mike Hearn
1f7d45f6ec TWP: Mention network parameters in the transaction components list. 2019-08-22 19:09:41 +02:00
Mike Hearn
5f735e174d TWP: Add a small discussion of versioning. 2019-08-22 19:09:41 +02:00
Mike Hearn
41bb43bdbe TWP: Add section on network parameters 2019-08-22 19:09:41 +02:00
Mike Hearn
d98696a549 TWP: Add discussion of identity, accounts 2019-08-22 19:09:41 +02:00
Mike Hearn
5ef7524d6d Get rid of ugly boxes around hyperlinks in the intro wp. 2019-08-22 19:09:41 +02:00
Mike Hearn
940ce78e1c Add authors (back) to renamed plat->intro wp. 2019-08-22 19:09:41 +02:00
Mike Hearn
c05b5911c6 Rename the new platform white paper back to introductory white paper,
because there are still quite a few links to the old name and URL even
within our own repository.

Reformat docsite slightly to make the white papers more prominent.

Also link to the Chinese/Japanese translations of the old paper.

Make the build script do both platform/intro and tech white papers.
2019-08-22 19:09:39 +02:00
Mike Hearn
d5f6d90b37 TWP: Address review comments 2019-08-22 19:05:06 +02:00
Mike Hearn
46a305602b Attempt to make a sentence about constraints easier to understand. 2019-08-22 19:05:06 +02:00
Mike Hearn
32450631a7 Move some sections into a "future work" section. 2019-08-22 19:05:06 +02:00
Mike Hearn
cc389f2a9c Read through the rest of the paper with minor tweaks. 2019-08-22 19:05:06 +02:00
Mike Hearn
59f839d80a Add remark about flow deniability. 2019-08-22 19:05:06 +02:00
Mike Hearn
d3c9679389 Rewrap file to a column limit that should fit in the GitHub diff viewer. 2019-08-22 19:05:06 +02:00
Mike Hearn
bf5cb51236 Add discussion of state pointers and the tokens SDK. (#5243)
* Add discussion of state pointers and the tokens SDK.

Fix ugly hyperlink boxes.

Comment out "market infrastructure" section for now as it was never implemented. It will come back in a later PR that creates a "future work" section.

* Address review comments.
2019-08-22 19:05:06 +02:00
Mike Hearn
a2c5cd1947 Tech white paper refresh, part 1 (#5233)
Tech white paper refresh, part 1.

In part 1:

* A new section is added on package namespace ownership and the no-overlap rule.
* The spelling of "serialize" is standardized on the US spelling used by the code, and add some content on serialization to the docs.
* Make a variety of smaller edits intended to make it read better.
* Spelling fixes.
* The discussion of C-I is temporarily removed, pending later re-addition in a new privacy section.
* Reference states are described.
* More TODOs are added to help me keep track of things that are needed.
* The discussion of time and clock sync is updated.
* The discussion of identity lookups is removed.
2019-08-22 19:05:06 +02:00
Mike Hearn
c7cb6ef725 Re-organise a part of the versioning discussion into a new toctree section. 2019-08-22 19:00:51 +02:00
Mike Hearn
178814b2d9 Improve the PDF by giving the book its own short intro page instead of
reusing the HTML intro, which doesn't make sense due to HTML-only markup
like videos.
2019-08-22 19:00:51 +02:00
Dan Newton
8fd5b7e489 DOCS - Correct links to checkpoint-tooling.html (#5387) 2019-08-22 16:30:02 +01:00