ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-20 21:43:14 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
7,801 Commits 91 Branches 405 Tags 354 MiB
35d0170b0a
Commit Graph

7801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Locke
35d0170b0a Merge branch 'master' into jlocke/merge_4.1_20190827 2019-08-27 15:21:21 +01:00
Jonathan Locke
f96105a014
CORDA-3157: Modify Corda's custom serialiser support for the DJVM. 
Modify Corda's custom serialiser support for the DJVM.
 2019-08-27 15:20:38 +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
Shams Asari
90284a6143
CORDA-2919: JacksonSupport, for CordaSerializable classes, improved to only uses those properties that are part of Corda serialisation (#5397) 2019-08-27 13:06:28 +01:00
Chris Rankin
e25d9a1d4e Update KDocs. 2019-08-27 11:24:41 +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
Katelyn Baker
7b308eb45f
NOTICK: Add BlobWriter and Schema Dumper 
The Blob Writer is a small kotlin app that allows arbitrary things to be serialized and then those bytes written to a file, quite useful for working on non JVM parsing of such things.

Along a similar vein, add a schema dumper alongside the blob-inspector to highlight the contents of the header
 2019-08-26 20:59:56 +01:00
Chris Rankin
92ae45a949 Fix typo decimal62 -> decimal64. 2019-08-26 15:26: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
43c61bfea1
Use full Apache 2.0 license so GitHub recognizes it 2019-08-23 12:24:37 +02:00
Chris Rankin
4ebd02bc04 Tidy up changes for review. 2019-08-23 11:11:11 +01:00
Chris Rankin
b2d335c518 Make the choice of AMQP serializer for primitive types configurable. 2019-08-23 08:52:16 +01:00
Chris Rankin
99074b5a49 Modify the fingerprinter not to use ConcurrentHashMap.computeIfAbsent() because we cannot guarantee that the cache is not reentered by the computation. 2019-08-23 08:52:04 +01:00
Chris Rankin
a5d5e0d476 Allow custom serialization for all subclasses of a configurable set of classes. 2019-08-23 08:51:56 +01:00
Chris Rankin
bdd5d13655 Provide a map of Java primitive types as a configuration value. 2019-08-23 08:51:47 +01:00
Chris Rankin
aa2f1029a6 Use LocalTypeIdentifier information where available to lookup CustomSerializer. 2019-08-23 08:51:37 +01:00
Chris Rankin
be64c89515 Implement generic CustomerSerializers that create more specific AMQPSerializer instances at runtime. 2019-08-23 08:51:27 +01:00
Chris Rankin
e4f38d1945 Ensure that described properties are associated with a descriptor. 2019-08-23 08:51:16 +01:00
Chris Rankin
8f0c7c947a Allow custom serializers to be registered with type aliases for deserializing. 2019-08-23 08:51:06 +01: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