Map enriched event types to the child objects they will contain

lib/firefly.ts

@@ -341,6 +341,10 @@ export default class FireFly extends HttpBase {
     return this.getOne<FireFlyTokenPoolResponse>(`/tokens/pools/${nameOrId}`, options);
   }
 
+  async deleteTokenPool(nameOrId: string, options?: FireFlyDeleteOptions) {
+    await this.deleteOne(`/tokens/pools/${nameOrId}`, options);
+  }
+
   mintTokens(transfer: FireFlyTokenMintRequest, options?: FireFlyCreateOptions) {
     return this.createOne<FireFlyTokenTransferResponse>('/tokens/mint', transfer, options);
   }

lib/interfaces.ts

@@ -146,27 +146,63 @@ export interface FireFlyEphemeralSubscription extends FireFlySubscriptionBase {
   namespace: string;
 }
 
-export interface FireFlyEnrichedEvent extends FireFlyEventResponse {
-  blockchainEvent?: FireFlyBlockchainEventResponse;
-  contractAPI?: FireFlyContractAPIResponse;
-  contractInterface?: FireFlyContractInterfaceResponse;
-  datatype?: FireFlyDatatypeResponse;
-  identity?: FireFlyIdentityResponse;
-  message?: FireFlyMessageResponse;
-  tokenApproval?: FireFlyTokenApprovalResponse;
-  tokenPool?: FireFlyTokenPoolResponse;
-  tokenTransfer?: FireFlyTokenTransferResponse;
-  transaction?: FireFlyTransactionResponse;
-  operation?: FireFlyOperationResponse;
-}
-
-export interface FireFlyEventDelivery extends FireFlyEnrichedEvent {
+export type FireFlyEnrichedEvent = FireFlyEventResponse &
+  (
+    | {
+        type: 'transaction_submitted';
+        transaction: FireFlyTransactionResponse;
+      }
+    | {
+        type: 'message_confirmed' | 'message_rejected';
+        message: FireFlyMessageResponse;
+      }
+    | {
+        type: 'identity_confirmed' | 'identity_updated';
+        identity: FireFlyIdentityResponse;
+      }
+    | {
+        type: 'token_pool_confirmed';
+        tokenPool: FireFlyTokenPoolResponse;
+      }
+    | {
+        type: 'token_transfer_confirmed';
+        tokenTransfer: FireFlyTokenTransferResponse;
+      }
+    | {
+        type: 'token_approval_confirmed';
+        tokenApproval: FireFlyTokenApprovalResponse;
+      }
+    | {
+        type: 'contract_interface_confirmed';
+        contractInterface: FireFlyContractInterfaceResponse;
+      }
+    | {
+        type: 'contract_api_confirmed';
+        contractAPI: FireFlyContractAPIResponse;
+      }
+    | {
+        type: 'blockchain_event_received';
+        blockchainEvent: FireFlyBlockchainEventResponse;
+      }
+    | {
+        type:
+          | 'token_pool_op_failed'
+          | 'token_approval_op_failed'
+          | 'blockchain_invoke_op_succeeded'
+          | 'blockchain_invoke_op_failed'
+          | 'blockchain_contract_deploy_op_succeeded'
+          | 'blockchain_contract_deploy_op_failed';
+        operation: FireFlyOperationResponse;
+      }
+  );
+
+export type FireFlyEventDelivery = FireFlyEnrichedEvent & {
   subscription: {
     id: string;
     name: string;
     namespace: string;
   };
-}
+};
 
 // Datatypes
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperledger/firefly-sdk",
-  "version": "1.2.10",
+  "version": "1.2.11",
   "description": "Client SDK for Hyperledger FireFly",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -45,4 +45,4 @@
     "form-data": "^4.0.0",
     "ws": "^8.5.0"
   }
-}
+}