Solana DvP sample #123

szymonsztuka · 2025-12-16T12:36:02Z

New CorDapp provides an example to perform a DvP (Delivery vs Payment) with Payment on Solana.
For details see README.md file.

…ousetoken-atomic-dvp

shamsasari · 2026-01-09T10:18:15Z

Solana/delivery-vs-payment/README.md

+The CordApp configuration file contains the following Solana account setting for a participant (Corda party):
+
+``solanaWalletFile`` - the file path with public-private key pair of the participant's wallet
+``solanaTokenMint`` - public key of the mint account of SPL token


This config needs to be stablecoinTokenMint, and the description updated

shamsasari · 2026-01-09T10:20:36Z

Solana/delivery-vs-payment/README.md

+
+``solanaWalletFile`` - the file path with public-private key pair of the participant's wallet
+``solanaTokenMint`` - public key of the mint account of SPL token
+``solanaRpcUrl`` - Solana RPC URL to obtain account info; e.g.: ``http://127.0.0.1:8899``


URL of the RPC provider for interacting with the blockchain. If you are using the test validator then this will be http://127.0.0.1:8899. If you want to use devnet then the URL is https://api.devnet.solana.com.

shamsasari · 2026-01-09T10:24:33Z

Solana/delivery-vs-payment/README.md

+``solanaWalletFile`` - the file path with public-private key pair of the participant's wallet
+``solanaTokenMint`` - public key of the mint account of SPL token
+``solanaRpcUrl`` - Solana RPC URL to obtain account info; e.g.: ``http://127.0.0.1:8899``
+``solanaWsUrl`` - Solana WS URL, not used by a flow in this sample, however needed by underlying client, for future use; e.g.: ``ws://127.0.0.1:8900``


The corresponding websocket URL of the RPC provider. ws://127.0.0.1:8900 for the test validator and wss://api.devnet.solana.com for devnet.

(There's no need to mention the detail that it's not used directly).

shamsasari · 2026-01-09T10:25:13Z

Solana/delivery-vs-payment/README.md

+``solanaRpcUrl`` - Solana RPC URL to obtain account info; e.g.: ``http://127.0.0.1:8899``
+``solanaWsUrl`` - Solana WS URL, not used by a flow in this sample, however needed by underlying client, for future use; e.g.: ``ws://127.0.0.1:8900``
+
+Public keys are written in Base58 format.


Which public keys are written?

"Public keys are written in Base58 format." is a left over, deleting it

shamsasari · 2026-01-09T10:25:41Z

Solana/delivery-vs-payment/README.md

+### Resiliency
+
+TODO


This is a sample, so no need to be open this can of worms.

shamsasari · 2026-01-09T10:28:39Z

Solana/delivery-vs-payment/README.md

+
+Public keys are written in Base58 format.
+
+## Pre-Requisites


Actually, it makes more sense for the pre-requisites to not only be before the config section, but be right at the beginning of the README. Also, the config section should be after that, before the concepts and details section. You have the first paragraph as a quick intro, then it should explain how to run the sample. And then it shoudl have the details of what the sample does.

shamsasari · 2026-01-09T10:29:20Z

Solana/delivery-vs-payment/README.md

+
+Public keys are written in Base58 format.
+
+## Pre-Requisites


This section also needs link to installing Solana

shamsasari · 2026-01-09T10:30:57Z

Solana/delivery-vs-payment/build.gradle

+        corda_release_group = constants.getProperty("cordaReleaseGroup")
+        corda_core_release_group =  constants.getProperty("cordaCoreReleaseGroup")
+        corda_release_version = constants.getProperty("cordaVersion")
+        corda_core_release_version = constants.getProperty("cordaCoreVersion")
+        corda_gradle_plugins_version = constants.getProperty("gradlePluginsVersion")
+        corda_solana_notary_version = constants.getProperty("cordaSolanaNotaryVersion")
+        corda_tokens_release_version = constants.getProperty("cordaTokensVersion")
+        sava_version = constants.getProperty("savaVersion")
+        corda_platform_version = constants.getProperty("platformVersion").toInteger()
+        kotlin_version = constants.getProperty("kotlinVersion")
+        junit_version = constants.getProperty("junitVersion")
+        log4j_version = constants.getProperty("log4jVersion")
+        slf4j_version = constants.getProperty("slf4jVersion")


I know we're followng existing samples, but this "pattern" is really stupid. I don't know why we ended up doing this in Corda/enterprise. If these constants are just put into the grade.properties file then they're automatically available in the build.gradle files.

the constants.properties file is one level above the project folder, and it's shared by all modules (here will be this sample and the bridging sample), we could remove this constants file with properties duplication for each module

shamsasari · 2026-01-09T10:33:22Z

Solana/delivery-vs-payment/build.gradle

+        log4j_version = constants.getProperty("log4jVersion")
+        slf4j_version = constants.getProperty("slf4jVersion")
+
+        testJvmArgs = ['--add-opens', 'java.base/java.time=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED',


There should be no need to have to define this list separately and then use in multiple places. The tasks.withType(Test) block below is already setting this to all test tasks, so this should be inlined there and the other places it's used removed.

shamsasari · 2026-01-09T10:34:40Z

...vs-payment/contracts/src/main/kotlin/net/corda/samples/solana/dvp/contracts/StockContract.kt

+            "Stock symbol must not be empty".using(!createdStockState.symbol.isEmpty())
+            "Stock name must not be empty".using(!createdStockState.name.isEmpty())


Why can't these be in the init block of StockState?

I keep this identical what is in stockbuydivided code, I presume the original code either didn't take init into an account, or it wanted to make it more explicit/enrich contract logic. The benefit of the latter is that you don't need to know about init semantics, and all business "checks" are in verify function. But I can change it here and move to init.

shamsasari · 2026-01-09T10:35:02Z

...ntracts/src/test/kotlin/net/corda/samples/solana/dvp/contracts/SharesPaymentContractTests.kt

+
+    @Test
+    fun `Agree verifies with correct output, signers, and Solana instruction`() {
+        val out = sampleState()


shamsasari · 2026-01-09T10:37:45Z

Solana/delivery-vs-payment/README.md

@@ -0,0 +1,68 @@
+# Solana DvP Sample CorDapp 
+
+This CorDapp provides an example to perform Delivery vs Payment ("DvP") transaction of an asset (a stock shares) 


Also add "atomic" in there

shamsasari · 2026-01-12T09:49:54Z

Solana/constants.properties

+cordaEnterpriseReleaseGroup=com.r3.corda
+cordaOsReleaseGroup=net.corda
+cordaEnterpriseVersion=4.14-20251230.004000-52
+cordaOsVersion=4.14-SNAPSHOT


Can we pin this down as well?

shamsasari · 2026-01-12T09:50:45Z

Solana/delivery-vs-payment/README.md

+Corda notary requires additional settings in the node configuration (``node.conf`` file). 
+They are grouped under ``solana`` sub-entry of ``notarty``:
+
+- ``rpcUrl`` URL of the RPC provider for interacting with the blockchain. If you are using the test validator
+then this will be `http://127.0.0.1:8899`; if you want to use devnet then the URL is `https://api.devnet.solana.com`
+- ``websocketUrl`` The corresponding websocket URL of the RPC provider. `ws://127.0.0.1:8900` for the test validator
+and `wss://api.devnet.solana.com` for devnet
+- ``notaryKeypairFile`` The notary [file-system wallet](https://docs.solanalabs.com/cli/wallets/file-system) 
+for singing Corda Program on Solana
+- ``custodiedKeysDir`` The directory for notary to store Corda participant Solana file-system wallets 
+for singing stablecoin transactions, these should be located in a different directory than the notary wallet
+- ``programWhitelist`` the list of Solana Programs that can be run by the Notary, set to address of SPL Token Program


We'll need to move this to the docsite as the general solana notary config needs to be documented

shamsasari · 2026-01-12T09:51:16Z

...ntracts/src/test/kotlin/net/corda/samples/solana/dvp/contracts/SharesPaymentContractTests.kt

    @Test
    fun `Agree verifies with correct output, signers, and Solana instruction`() {
-        val out = sampleState()
+        val outpput = sampleState()


mkitR3 · 2026-01-12T11:21:53Z

...nt/contracts/src/main/kotlin/net/corda/samples/solana/dvp/contracts/SharesPaymentContract.kt

+                "No inputs should be consumed." using (tx.inputsOfType<SharesPaymentState>().isEmpty())
+                val outputs = tx.outputsOfType<SharesPaymentState>()
+                "One output should be created." using (outputs.size == 1)
+                val output = tx.outputsOfType<SharesPaymentState>().single()


Minor:singleOrNull and then requireNotNull

mkitR3

Looks good to me. I think the current implementation is sufficient for the demo purposes.

szymonsztuka added 24 commits December 9, 2025 18:23

Add Solana Notary to Driver test

1ef4d1a

Reformat to reduce diff

180b5d6

Merge remote-tracking branch 'origin/release/ent/4.14' into dollartoh…

e8ea9ad

…ousetoken-atomic-dvp

Reformat to reduce diff

3c1397f

dependency on Corda 4.14-SNAPSHOT

5a22887

dependencies to run the test validator

d122eee

Merge remote-tracking branch 'origin/release/ent/4.14' into dollartoh…

f6f12cb

…ousetoken-atomic-dvp

Test assertions for accounts + test mint.

97f2fbe

Call flows in the test

9f53f69

Hardcoded test with mint instead of transfer

4ec656a

Token2022 transfer

4b9284e

Token2022 transfer fixes

7a1d3ec

Use SPL Token

2531615

Buyer verifies a notary instruction

f699048

Remove div

fa9e13a

API call change

920a900

Payer sends own addresses

ca53b45

follow API package change

95f5465

Separate config

defba8d

Buyer verifies transaction

0939a6c

Added state and contract to force buyer to verify a transaction

ff3b9ce

Remove unused code

49e98aa

Undo changes in dollarhousetoken sample

0851f49

Solan DVP sample with a non fungible token.

5ac61a4

szymonsztuka mentioned this pull request Dec 16, 2025

Dollartohousetoken with atomic DVP #120

Closed

szymonsztuka added 4 commits December 16, 2025 12:46

Rename classes, remove deployNodes

92c0b61

readme

2650293

Readme for generic Delivery token

af43519

Refactoring

9ab768c

szymonsztuka requested a review from shamsasari December 19, 2025 14:52

shamsasari reviewed Jan 9, 2026

View reviewed changes

shamsasari changed the title ~~Atomic Solana DvP sample~~ Solana DvP sample Jan 9, 2026

Addressing review comments; added configuration for notary in reademe.md

f4c0bc0

szymonsztuka requested review from mkitR3 and shamsasari and removed request for mkitR3 January 9, 2026 14:52

shamsasari reviewed Jan 12, 2026

View reviewed changes

Addressing review comments

c6bd04b

mkitR3 reviewed Jan 12, 2026

View reviewed changes

mkitR3 previously approved these changes Jan 12, 2026

View reviewed changes

Addressing review comments

c072fe8

szymonsztuka dismissed mkitR3’s stale review via c072fe8 January 12, 2026 13:21

szymonsztuka requested review from mkitR3 and shamsasari January 12, 2026 13:22

shamsasari approved these changes Jan 12, 2026

View reviewed changes

shamsasari merged commit 7971cd4 into release/ent/4.14 Jan 12, 2026

shamsasari deleted the atomic-dvp branch January 12, 2026 13:42

		"Stock symbol must not be empty".using(!createdStockState.symbol.isEmpty())
		"Stock name must not be empty".using(!createdStockState.name.isEmpty())

		@@ -0,0 +1,68 @@
		# Solana DvP Sample CorDapp

		This CorDapp provides an example to perform Delivery vs Payment ("DvP") transaction of an asset (a stock shares)

		### Resiliency

		TODO No newline at end of file

Solana DvP sample #123

Solana DvP sample #123

Uh oh!

Conversation

szymonsztuka commented Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

shamsasari Jan 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

shamsasari Jan 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mkitR3 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

szymonsztuka commented Dec 16, 2025 •

edited

Loading

shamsasari Jan 9, 2026 •

edited

Loading

shamsasari Jan 9, 2026 •

edited

Loading