f3c45e9d1b
Merge pull request #7677 from corda/adel/ENT-11504
...
ENT-11504: Bind to the same address that the server socket created.
2024-02-28 13:01:37 +00:00
db9017f4ed
DOC-6353 - updated readme, fixed links and removed out of date info ( #7676 )
...
* DOC-6353 - updated readme, fixed links and removed out of date info
---------
Co-authored-by: Ronan Browne <ronan.browne@R3.com >
2024-02-22 15:45:36 +00:00
0000c75391
ENT-11504: Bind to the same address that the server socket created.
2024-02-22 12:52:11 +00:00
9babf8d801
Merge pull request #7673 from corda/shams-contracts-component-group
...
ENT-11355: Backwards compatibility with older nodes via new attachments component group
2024-02-21 15:11:20 +00:00
200333b198
ENT-11355: Backwards compatibility with older nodes via new attachments component group
2024-02-19 17:19:49 +00:00
c2742ba6a5
Merge pull request #7672 from corda/shams-tx-builder-cleanup
...
ENT-11355: Cleanup of TransactionBuilder and CorDapp loading
2024-02-15 17:57:48 +00:00
8fd3139df1
ENT-11355: Cleanup of TransactionBuilder and CorDapp loading
...
This is code refactoring and cleanup that is required to add a new WireTransaction component group for 4.12+ attachments, and for supporting legacy (4.11 or older) contract CorDapps in the node.
2024-02-12 14:27:07 +00:00
c7514e1c60
ENT-11443 Function sig changes to support removing enterprise compiler warnings ( #7671 )
2024-02-07 14:46:18 +00:00
a95b854b1e
ENT-11386: Using NodeAttachmentService instead of fat interface ServiceHub. ( #7670 )
2024-02-01 11:49:52 +00:00
50a6f2f495
Merge pull request #7669 from corda/merge-release/os/4.11-release/os/4.12-2024-01-30-129
...
ENT-11387: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-01-30
2024-01-31 09:39:37 +00:00
ee71bf5a78
ENT-11351 - Compiler warnings pass 5 ( #7666 )
...
* Reduce compiler warnings
* Address PR review comments
* Acually make use of capitalize(),decapitalize()
2024-01-30 18:09:55 +00:00
5bfc39c364
Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-01-30
2024-01-30 15:44:32 +00:00
df07b7b8da
Merge pull request #7668 from corda/merge-release/os/4.10-release/os/4.11-2024-01-30-87
...
ENT-11387: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-01-30
2024-01-30 15:43:36 +00:00
b6c2d17dae
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-01-30
2024-01-30 11:51:24 +00:00
4faa0caeb3
Merge pull request #7667 from corda/merge-release/os/4.9-release/os/4.10-2024-01-30-95
...
ENT-11387: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-01-30
2024-01-30 11:49:45 +00:00
f2522943f2
Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-01-30
2024-01-30 09:08:36 +00:00
fa173baaee
ENT-11387: Fix to prevent interleaved stop/start causing bridge to be started with null session. ( #7665 )
...
* ENT-11387: Fix to prevent interleaved stop/start causing bridge to be started with null session.
* ENT-11387: Fixed bug in assigning null to session.
2024-01-30 09:07:18 +00:00
9b794795a0
ENT-11351 - Compiler warnings pass 4 ( #7663 )
...
* Compiler warnings
* Resolve detekt errors
* Reverted code change; added warning suppression
* Address PR review comments
2024-01-29 13:49:00 +00:00
a7d0684fe7
ENT-11384: Cleanup JarScanningCordappLoader ( #7664 )
...
* It uses URLs when in fact CorDapps are jar files, and so should being Path. It also does URL equality, which is not recommended
* Address (very old) TODO of removing RestrictedURL, which is not needed
Also, back-ported some minor changes from https://github.com/corda/enterprise/pull/5057 .
2024-01-29 13:44:14 +00:00
d642ebfbd7
Merge pull request #7662 from corda/arshadm/ent-6914-disable-node-metadata
...
ENT-6914 Disabled module metadata generation for the node capsule
2024-01-25 14:10:38 +00:00
63f8e220c8
ENT-11251: Upgrade to Kotlin language version 1.9 ( #7660 )
2024-01-25 13:51:19 +00:00
4ea42c4d75
ENT-6914 Disabled module metadata generation for the node capsule as it was generating invalid json
2024-01-25 12:11:47 +00:00
3d90c1d850
Merge pull request #7658 from corda/merge-release/os/4.11-release/os/4.12-2024-01-22-120
...
ENT-10900: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-01-22
2024-01-25 10:39:51 +00:00
975500d878
ENT-11351 - Compiler warnings pass 3 ( #7659 )
...
* More compiler warnings fixed
* Amended deprecation suppression annotations, as per review comments
2024-01-25 10:18:58 +00:00
3abb218bca
Merge pull request #7654 from corda/shams-external-verifier-analyse-txs
...
ENT-11255: Scan attachments to determine if they are Kotlin 1.2 or later
2024-01-23 16:56:47 +00:00
5c193ce47f
ENT-11113 Uncommented ignored test cases ( #7648 )
...
ENT-11113 Uncommented ignored test cases
ENT-11113 Updated time for Flow Speed Test
2024-01-23 15:11:50 +00:00
f15e6ec56a
ENT-11351 - Compiler warnings pass 2 ( #7655 )
...
* Addressed compiler warnings
* Removed unchecked cast fixes - not for this PR
* Sorted out detekt issues
2024-01-23 10:19:03 +00:00
fd66ff81d0
Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-01-22
2024-01-22 14:09:52 +00:00
d1ab9b1c25
Merge pull request #7657 from corda/merge-release/os/4.10-release/os/4.11-2024-01-22-78
...
ENT-10900: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-01-22
2024-01-22 14:08:28 +00:00
a0ce265b35
Merge pull request #7656 from corda/arshadm/ent-6914-fix-publish-pom
...
ENT-6914 Fix generated pom
2024-01-22 13:27:39 +00:00
aca4c81a27
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-01-22
2024-01-22 12:11:53 +00:00
418a0c1585
Merge pull request #7653 from corda/merge-release/os/4.9-release/os/4.10-2024-01-17-81
...
ENT-10900: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-01-17
2024-01-22 12:10:39 +00:00
f30ba33929
ENT-11255: Scan attachments to determine if they are Kotlin 1.2 or later
...
The node now sends a transaction to the verifier if any of its attachments were compiled with Kotlin 1.2 (the net.corda.node.verification.external system property has been removed). It uses kotlinx-metadata to read the Kotlin metadata in the attachment to determine this. For now this scanning is done each time the attachment is loaded from the database.
The existing external verification integration tests were converted into smoke tests so that 4.11 nodes could be involved. This required various improvements to NodeProcess.Factory. A new JAVA_8_HOME environment variable, pointing to JDK 8, is required to run these tests.
There is still some follow-up work that needs to be done:
Sending transactions from a 4.11 node to a 4.12 node works, but not the other way round. A new WireTransaction component group needs to be introduced for storing 4.12 attachments so that they can be safely ignored by 4.11 nodes, and the 4.12 node needs to be able to load both 4.11 and 4.12 versions of the same contracts CorDapp so that they can be both attached to the transaction.
Even though attachments are cached when retrieved from the database, the Kotlin metadata version should be stored in the attachments db table, rather than being scanned each time.
Finally, VerificationService was refactored into NodeVerificationSupport and can be passed into SignedTransaction.verifyInternal, instead of needing the much heavier VerifyingServiceHub. This makes it easier for internal tools to verify transactions and spawn the verifier if necessary.
2024-01-22 11:31:51 +00:00
e5355d9e75
ENT-6914 Fix generated pom
2024-01-22 10:22:08 +00:00
1ff853b421
ENT-11351 - Compiler warnings pass 1 ( #7652 )
...
* Removed warnings - pass 1
* Resolve detekt errors
* Properly compare X500 distinguished names
2024-01-19 10:26:50 +00:00
c07b3906aa
Merge pull request #7650 from corda/merge-release/os/4.11-release/os/4.12-2024-01-15-112
...
ENT-10894: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-01-15
2024-01-18 12:26:31 +00:00
4b92233cdd
Merge pull request #7647 from corda/bk/jd17_fixes_15_jan
...
ENT-11113 Test case no longer using reflection to change final modifier on node logger
2024-01-18 12:24:03 +00:00
795e61807d
ENT-11113 Fixed review comments
2024-01-18 00:34:59 +05:30
13e13fd236
ENT-11113 Updating test case to user overrridden Sysout instead of mock
2024-01-18 00:15:46 +05:30
f7157abf9a
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-01-17-81
2024-01-17 17:08:59 +00:00
b02b3c8b97
Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-01-15
2024-01-15 13:57:06 +00:00
aad2f3c170
Merge pull request #7649 from corda/merge-release/os/4.10-release/os/4.11-2024-01-15-70
...
ENT-10894: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-01-15
2024-01-15 13:55:56 +00:00
7986c8bca6
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-01-15
2024-01-15 11:06:22 +00:00
3d7db25d13
Merge pull request #7645 from corda/cc/dev/4.10/security_vulns
...
ENT-10894 - Security vulnerabilities
2024-01-15 11:05:20 +00:00
49f35aa5ea
ENT-11113 Updating test case for accessing modifier as per JDK17 compatibility
2024-01-15 15:26:10 +05:30
4793cd5f31
Merge pull request #7644 from corda/cc/dev/4.9/security_vulns
...
ENT-10900 - Security vulnerabilities
2024-01-12 18:29:16 +00:00
d9e0172bf7
Merge pull request #7643 from corda/bk/os_fixes_412
...
ENT-11113 Update instant time resolution in test cases
2024-01-12 18:26:25 +00:00
52a6d477da
Upgraded Jetty
2024-01-12 17:12:46 +00:00
07a2d98d0b
Security vulnerabilities
2024-01-12 11:51:12 +00:00
22e96f1bda
ENT-11113 Instant default time resolution is nano but HashedDistributionList.PublicHeader default derialisation happens at millis resolution to passing time in millis resolution as input
2024-01-11 18:15:19 +05:30
