Merge pull request #287 from digital-asset/fix-runaway-triggers

alexgraham-da · web-flow · commit b7115ad53c3d · 2021-04-26T12:19:28.000-04:00
Fix runaway triggers
diff --git a/Makefile b/Makefile
@@ -143,7 +143,7 @@ $(exberry_adapter_dir):
 	rm -fr exberry_adapter/marketplace_exchange_adapter.egg-info
 
 $(adapter_pid): |$(state_dir) $(exberry_adapter_dir)
-	cd exberry_adapter && (DAML_LEDGER_URL=localhost:6865 poetry run python bot/exberry_adapter_bot.py > ../$(adapter_log) & echo "$$!" > ../$(adapter_pid))
+	cd exberry_adapter && (DAML_LEDGER_URL=localhost:6865 $(PYTHON) bot/exberry_adapter_bot.py > ../$(adapter_log) & echo "$$!" > ../$(adapter_pid))
 
 start_adapter: $(adapter_pid)
 
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ This can be done by rebuilding the project using `make clean && make package`.
 Alternatively, to only build the DAR file and regenerate the TypeScript bindings:
 ```
 daml build
-daml codegen js .daml/dist/da-marketplace-0.1.17.dar -o daml.js
+daml codegen js .daml/dist/da-marketplace-0.1.18.dar -o daml.js
 cd ui
 yarn install --force --frozen-lockfile
 ```
diff --git a/dabl-meta.yaml b/dabl-meta.yaml
@@ -1,6 +1,6 @@
 catalog:
     name: da-marketplace
-    version: 0.1.17
+    version: 0.1.18
     short_description: DA Marketplace
     description: A marketplace for issuing and trading digital tokens.
     release_date: 2020-10-14
@@ -10,7 +10,7 @@ catalog:
     tags: [ dabl-sample-app, application ]
     icon_file: marketplace.svg
 subdeployments:
-    - da-marketplace-model-0.1.17.dar
-    - da-marketplace-triggers-0.1.17.dar
-    - da-marketplace-exberry-adapter-0.1.17.tar.gz
-    - da-marketplace-ui-0.1.17.zip
+    - da-marketplace-model-0.1.18.dar
+    - da-marketplace-triggers-0.1.18.dar
+    - da-marketplace-exberry-adapter-0.1.18.tar.gz
+    - da-marketplace-ui-0.1.18.zip
diff --git a/daml.yaml b/daml.yaml
@@ -14,7 +14,7 @@ parties:
   - Exchange
   - Broker
   - Ccp
-version: 0.1.17
+version: 0.1.18
 dependencies:
   - daml-prim
   - daml-stdlib
diff --git a/daml/Marketplace/CentralCounterpartyCustomer.daml b/daml/Marketplace/CentralCounterpartyCustomer.daml
@@ -39,7 +39,7 @@ template CCPCustomerInvitation
           create DismissibleNotification with
             sender = ccpCustomer, senderRole = Some InvestorRole
             receiver = ccp, text = "CCP customer invitation accepted."
-          create CCPCustomer with inGoodStanding = True, marginDepositCids = [], ..
+          createOrLookup CCPCustomer with inGoodStanding = True, marginDepositCids = [], ..
 
       CCPCustomerInvitation_Reject : ()
         do
diff --git a/daml/Marketplace/Custodian.daml b/daml/Marketplace/Custodian.daml
@@ -46,7 +46,7 @@ template CustodianRelationshipRequest
           create DismissibleNotification with
             sender = custodian, senderRole = Some CustodianRole
             receiver = requester, text = "Relationship request accepted."
-          create CustodianRelationship with party = requester, ..
+          createOrLookup CustodianRelationship with party = requester, ..
 
       CustodianRelationshipRequest_Reject : ()
         do
@@ -73,8 +73,8 @@ template CustodianInvitation
           name : Text
           location : Text
         do
-          create RegisteredCustodian with ..
-          create Custodian with investors = [], exchanges = [], brokers = [], issuers = [], ..
+          createOrLookup RegisteredCustodian with ..
+          createOrLookup Custodian with investors = [], exchanges = [], brokers = [], issuers = [], ..
 
 
 template Custodian
diff --git a/daml/Marketplace/Exchange.daml b/daml/Marketplace/Exchange.daml
@@ -33,8 +33,8 @@ template ExchangeInvitation
           name : Text
           location : Text
         do
-          create RegisteredExchange with ..
-          create Exchange with tokenPairs = [], clearedMarkets = [], binOptions = [], participants = [], ..
+          createOrLookup RegisteredExchange with ..
+          createOrLookup Exchange with tokenPairs = [], clearedMarkets = [], binOptions = [], participants = [], ..
 
 
 -- |Request from an investor or broker to be added to the exchange
@@ -55,7 +55,7 @@ template ExchangeParticipantInvitationRequest
             sender = exchange, senderRole = Some ExchangeRole
             receiver = participant, text = "Exchange participant request accepted."
           exerciseByKey @Exchange (operator,exchange) Exchange_AddParticipant with exchParticipant = participant
-          create ExchangeParticipant with exchParticipant = participant, ..
+          createOrLookup ExchangeParticipant with exchParticipant = participant, ..
 
       ExchangeInvtationRequest_Reject : ()
         do
@@ -86,13 +86,13 @@ template Exchange
       nonconsuming Exchange_RequestCustodianRelationship : ContractId CustodianRelationshipRequest
         with
           custodian : Party
-        do create CustodianRelationshipRequest with requester = exchange, role = ExchangeRole, ..
+        do createOrLookup CustodianRelationshipRequest with requester = exchange, role = ExchangeRole, ..
 
       nonconsuming Exchange_RequestCCPRelationship : ContractId CCPExchangeRelationshipRequest
         with
           ccp : Party
         do
-          create CCPExchangeRelationshipRequest with requester = exchange, party = ccp, requesterRole = ExchangeRole, ..
+          createOrLookup CCPExchangeRelationshipRequest with requester = exchange, party = ccp, requesterRole = ExchangeRole, ..
 
       Exchange_InviteParticipant : (ContractId Exchange, ContractId ExchangeParticipantInvitation)
         with
diff --git a/daml/Marketplace/ExchangeParticipant.daml b/daml/Marketplace/ExchangeParticipant.daml
@@ -25,7 +25,7 @@ template ExchangeParticipantInvitation
           create DismissibleNotification with
             sender = exchParticipant, senderRole = None
             receiver = exchange, text = "Exchange invitation accepted."
-          create ExchangeParticipant with ..
+          createOrLookup ExchangeParticipant with ..
 
       ExchangeParticipantInvitation_Reject : ()
         do
diff --git a/daml/Marketplace/Investor.daml b/daml/Marketplace/Investor.daml
@@ -30,8 +30,8 @@ template InvestorInvitation
           name : Text
           location : Text
         do
-          create RegisteredInvestor with ..
-          create Investor with ..
+          createOrLookup RegisteredInvestor with ..
+          createOrLookup Investor with ..
 
 
 template Investor
@@ -50,13 +50,13 @@ template Investor
       nonconsuming Investor_RequestCustodianRelationship : ContractId CustodianRelationshipRequest
         with
           custodian : Party
-        do create CustodianRelationshipRequest with requester = investor, role = InvestorRole, ..
+        do createOrLookup CustodianRelationshipRequest with requester = investor, role = InvestorRole, ..
 
       nonconsuming Investor_RequestExchangeParticipantInvitation : ContractId ExchangeParticipantInvitationRequest
         with
           exchange : Party
         do
-          create ExchangeParticipantInvitationRequest with operator, exchange, participant = investor
+          createOrLookup ExchangeParticipantInvitationRequest with operator, exchange, participant = investor
 
       nonconsuming Investor_RequestDepositTransfer : ContractId DepositTransferRequest
         with
diff --git a/daml/Marketplace/Issuer.daml b/daml/Marketplace/Issuer.daml
@@ -31,8 +31,8 @@ template IssuerInvitation
           title : Text
           issuerID : Text
         do
-          create RegisteredIssuer with ..
-          create Issuer with ..
+          createOrLookup RegisteredIssuer with ..
+          createOrLookup Issuer with ..
 
 
 template Issuer
@@ -57,7 +57,7 @@ template Issuer
         do
           let tokenId = Id with signatories = fromList [issuer], label = name, version = 0
           let tokenObservers = if isPublic then (public :: operator :: observers) else observers
-          create Token with id = tokenId, observers = fromList tokenObservers, ..
+          createOrLookup Token with id = tokenId, observers = fromList tokenObservers, ..
 
       nonconsuming Issuer_IssueBinaryOption : ContractId BinaryOption
         with
@@ -70,7 +70,7 @@ template Issuer
         do
           let binOptionId = Id with signatories = fromList [issuer], label = name, version = 0
           let binOptionObservers = if isPublic then (public :: observers) else observers
-          create BinaryOption with id = binOptionId, observers = fromList binOptionObservers, ..
+          createOrLookup BinaryOption with id = binOptionId, observers = fromList binOptionObservers, ..
 
       nonconsuming Issuer_IssueDerivative : (Id, ContractId Derivative)
         with
@@ -98,4 +98,4 @@ template Issuer
       nonconsuming Issuer_RequestCustodianRelationship : ContractId CustodianRelationshipRequest
         with
           custodian : Party
-        do create CustodianRelationshipRequest with requester = issuer, role = IssuerRole, ..
+        do createOrLookup CustodianRelationshipRequest with requester = issuer, role = IssuerRole, ..
diff --git a/daml/Marketplace/Onboarding.daml b/daml/Marketplace/Onboarding.daml
@@ -69,7 +69,7 @@ template UserSession
     controller operator can
       UserSession_Ack : ()
         do
-          create User with currentRole = role, ..
+          createOrLookup User with currentRole = role, ..
           onboardRole role operator user
 
 template User
diff --git a/daml/Marketplace/Operator.daml b/daml/Marketplace/Operator.daml
@@ -6,7 +6,7 @@ import Marketplace.Custodian
 import Marketplace.Exchange
 import Marketplace.Investor
 import Marketplace.Issuer
-
+import Marketplace.Utils
 
 template PublicAppInfo
   with
@@ -32,34 +32,34 @@ template Operator
         with
           custodian : Party
         do
-          create CustodianInvitation with ..
+          createOrLookup CustodianInvitation with ..
 
       nonconsuming Operator_OnboardIssuer : ContractId IssuerInvitation
         with
           issuer : Party
         do
-          create IssuerInvitation with ..
+          createOrLookup IssuerInvitation with ..
 
       nonconsuming Operator_OnboardInvestor : ContractId InvestorInvitation
         with
           investor : Party
         do
-          create InvestorInvitation with ..
+          createOrLookup InvestorInvitation with ..
 
       nonconsuming Operator_OnboardExchange : ContractId ExchangeInvitation
         with
           exchange : Party
         do
-          create ExchangeInvitation with ..
+          createOrLookup ExchangeInvitation with ..
 
       nonconsuming Operator_OnboardBroker : ContractId BrokerInvitation
         with
           broker : Party
         do
-          create BrokerInvitation with ..
+          createOrLookup BrokerInvitation with ..
 
       nonconsuming Operator_OnboardCCP : ContractId CCPInvitation
         with
           ccp : Party
         do
-          create CCPInvitation with ..
+          createOrLookup CCPInvitation with ..
diff --git a/daml/Marketplace/Trading.daml b/daml/Marketplace/Trading.daml
@@ -172,7 +172,7 @@ template Order
 
     controller exchParticipant can
       nonconsuming Order_RequestCancel : ContractId OrderCancelRequest
-        do create OrderCancelRequest with order = this
+        do createOrLookup OrderCancelRequest with order = this
 
 
 assetSplit : Asset -> [Decimal] -> [Asset]
@@ -307,7 +307,7 @@ template ClearedOrder
 
     controller exchParticipant can
       nonconsuming ClearedOrder_RequestCancel : ContractId ClearedOrderCancelRequest
-        do create ClearedOrderCancelRequest with order = this
+        do createOrLookup ClearedOrderCancelRequest with order = this
 
 template ClearedOrderCancelRequest
   with
diff --git a/daml/Marketplace/Utils.daml b/daml/Marketplace/Utils.daml
@@ -67,3 +67,14 @@ headNote : Text -> [a] -> a
 headNote msg [] = error ("headNote: " <> msg)
 headNote _   xs = head xs
 
+type OptionalCreate a = Optional (ContractId a)
+
+createWhenNotExists : forall t k. (Template t, TemplateKey t k) => t -> Update (OptionalCreate t)
+createWhenNotExists t = visibleByKey @t (key t) >>= \case
+    True  -> Some <$> create t
+    False -> return None
+
+createOrLookup : forall t k. (Template t, TemplateKey t k) => t -> Update (ContractId t)
+createOrLookup t = lookupByKey @t (key t) >>= \case
+    (Some cid) -> return cid
+    None       -> create t
diff --git a/exberry_adapter/setup.py b/exberry_adapter/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='marketplace-exchange-adapter',
-      version='0.1.17',
+      version='0.1.18',
       description='Daml Marketplace Exchange Adapter',
       author='Digital Asset',
       url='daml.com',
diff --git a/triggers/daml.yaml b/triggers/daml.yaml
@@ -11,13 +11,13 @@ parties:
   - Public
   - Exchange
   - Broker
-version: 0.1.17
+version: 0.1.18
 # trigger-dependencies-begin
 dependencies:
   - daml-prim
   - daml-stdlib
   - daml-trigger
 data-dependencies:
-  - ../.daml/dist/da-marketplace-0.1.17.dar
+  - ../.daml/dist/da-marketplace-0.1.18.dar
 sandbox-options:
   - --wall-clock-time
diff --git a/ui/package.json b/ui/package.json
@@ -1,9 +1,9 @@
 {
     "name": "da-marketplace",
-    "version": "0.1.17",
+    "version": "0.1.18",
     "private": true,
     "dependencies": {
-        "@daml.js/da-marketplace": "file:../daml.js/da-marketplace-0.1.17",
+        "@daml.js/da-marketplace": "file:../daml.js/da-marketplace-0.1.18",
         "@daml/hub-react": "0.1.0",
         "@daml/ledger": "1.10.0",
         "@daml/react": "1.10.0",
diff --git a/ui/src/components/LoginScreen.tsx b/ui/src/components/LoginScreen.tsx
@@ -331,7 +331,7 @@ const DablLoginForm: React.FC<Props> = ({ onLogin }) => {
                 icon='right arrow blue'
                 labelPosition='right'
                 className='dabl-login-button'
-                content={<p className='bold'>Log in with DABL</p>}
+                content={<p className='bold'>Log in with Daml Hub</p>}
                 onClick={handleDablLogin}
             />
         </Form>
