fix: Disable unstable dpki and countersigning for 0.4 (#245)

* Remove unstable dpki and countersigning for 0.4

* Bump rust crate versions

* Update changelog

* Rebuild docs

* Fix failing ci

CHANGELOG.md

@@ -3,6 +3,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## \[Unreleased\]
+### Fixed
+- Disable unstable DPKI.
+- Disable tests with unstable features.
 
 ### Added
 ### Removed

Cargo.toml

@@ -10,8 +10,8 @@ resolver = "2"
 
 [workspace.dependencies]
 futures = "0.3"
-hdi = "0.5.0-rc.0"
-hdk = "0.4.0-rc.0"
+hdi = "0.5.0-rc.1"
+hdk = "0.4.0-rc.1"
 nix = { version = "0.29.0", features = ["signal"] }
 once_cell = "1.5.0"
 parking_lot = "0.12"

crates/trycp_server/Cargo.toml

@@ -37,7 +37,7 @@ trycp_api = { workspace = true }
 url = { workspace = true }
 
 [dev-dependencies]
-holochain_conductor_api = "0.4.0-rc.0"
+holochain_conductor_api = "0.4.0-rc.1"
 rand = "0.8"
 serde_yaml = "0.9"
 trycp_client = { path = "../trycp_client" }

crates/trycp_server/tests/integration.rs

@@ -32,9 +32,8 @@ async fn multiple_conductors_on_same_machine_are_assigned_different_admin_ports(
                     id: id_player_1.to_string(),
                     partial_config: "dpki:
     dna_path: ~
-    network_seed: test
-    allow_throwaway_random_dpki_agent_key: true
-    no_dpki: false"
+    network_seed: ~
+    no_dpki: true"
                         .to_string(),
                 },
                 ONE_MIN,
@@ -87,9 +86,8 @@ async fn multiple_conductors_on_same_machine_are_assigned_different_admin_ports(
                     id: id_player_2.to_string(),
                     partial_config: "dpki:
     dna_path: ~
-    network_seed: test
-    allow_throwaway_random_dpki_agent_key: true
-    no_dpki: false"
+    network_seed: ~
+    no_dpki: true"
                         .to_string(),
                 },
                 ONE_MIN,

docs/tryorama.adminapiresponse.md

@@ -9,7 +9,7 @@ All possible responses from the Admin API.
 **Signature:**
 
 ```typescript
-export type AdminApiResponse = AdminApiResponseAgentInfo | AdminApiResponseAgentInfoAdded | AdminApiResponseAgentPubKeyGenerated | AdminApiResponseAppDisabled | AdminApiResponseAppEnabled | AdminApiResponseAppInstalled | AdminApiResponseAppInterfaceAttached | AdminApiResponseAppInterfacesListed | AdminApiResponseAppStarted | AdminApiResponseAppUninstalled | AdminApiResponseAppsListed | AdminApiResponseCellIdsListed | AdminApiResponseCloneCellDeleted | AdminApiResponseCoordinatorsUpdated | AdminApiResponseDnasDefinitionReturned | AdminApiResponseGetCompatibleCells | AdminApiResponseDnasListed | AdminApiResponseDnaRegistered | AdminApiResponseFullStateDumped | AdminApiResponseNetworkStatsDumped | AdminApiResponseStateDumped | AdminApiResponseStorageInfo | AdminApiResponseAppAuthenticationTokenIssued | AdminApiResponseZomeCallCapabilityGranted;
+export type AdminApiResponse = AdminApiResponseAgentInfo | AdminApiResponseAgentInfoAdded | AdminApiResponseAgentPubKeyGenerated | AdminApiResponseAppDisabled | AdminApiResponseAppEnabled | AdminApiResponseAppInstalled | AdminApiResponseAppInterfaceAttached | AdminApiResponseAppInterfacesListed | AdminApiResponseAppStarted | AdminApiResponseAppUninstalled | AdminApiResponseAppsListed | AdminApiResponseCellIdsListed | AdminApiResponseCloneCellDeleted | AdminApiResponseCoordinatorsUpdated | AdminApiResponseDnasDefinitionReturned | AdminApiResponseGetCompatibleCells | AdminApiResponseDnasListed | AdminApiResponseDnaRegistered | AdminApiResponseFullStateDumped | AdminApiResponseNetworkStatsDumped | AdminApiResponseAgentKeyRevoked | AdminApiResponseStateDumped | AdminApiResponseStorageInfo | AdminApiResponseAppAuthenticationTokenIssued | AdminApiResponseZomeCallCapabilityGranted;
 ```
-**References:** [AdminApiResponseAgentInfo](./tryorama.adminapiresponseagentinfo.md)<!-- -->, [AdminApiResponseAgentInfoAdded](./tryorama.adminapiresponseagentinfoadded.md)<!-- -->, [AdminApiResponseAgentPubKeyGenerated](./tryorama.adminapiresponseagentpubkeygenerated.md)<!-- -->, [AdminApiResponseAppDisabled](./tryorama.adminapiresponseappdisabled.md)<!-- -->, [AdminApiResponseAppEnabled](./tryorama.adminapiresponseappenabled.md)<!-- -->, [AdminApiResponseAppInstalled](./tryorama.adminapiresponseappinstalled.md)<!-- -->, [AdminApiResponseAppInterfaceAttached](./tryorama.adminapiresponseappinterfaceattached.md)<!-- -->, [AdminApiResponseAppInterfacesListed](./tryorama.adminapiresponseappinterfaceslisted.md)<!-- -->, [AdminApiResponseAppStarted](./tryorama.adminapiresponseappstarted.md)<!-- -->, [AdminApiResponseAppUninstalled](./tryorama.adminapiresponseappuninstalled.md)<!-- -->, [AdminApiResponseAppsListed](./tryorama.adminapiresponseappslisted.md)<!-- -->, [AdminApiResponseCellIdsListed](./tryorama.adminapiresponsecellidslisted.md)<!-- -->, [AdminApiResponseCloneCellDeleted](./tryorama.adminapiresponseclonecelldeleted.md)<!-- -->, [AdminApiResponseCoordinatorsUpdated](./tryorama.adminapiresponsecoordinatorsupdated.md)<!-- -->, [AdminApiResponseDnasDefinitionReturned](./tryorama.adminapiresponsednasdefinitionreturned.md)<!-- -->, [AdminApiResponseGetCompatibleCells](./tryorama.adminapiresponsegetcompatiblecells.md)<!-- -->, [AdminApiResponseDnasListed](./tryorama.adminapiresponsednaslisted.md)<!-- -->, [AdminApiResponseDnaRegistered](./tryorama.adminapiresponsednaregistered.md)<!-- -->, [AdminApiResponseFullStateDumped](./tryorama.adminapiresponsefullstatedumped.md)<!-- -->, [AdminApiResponseNetworkStatsDumped](./tryorama.adminapiresponsenetworkstatsdumped.md)<!-- -->, [AdminApiResponseStateDumped](./tryorama.adminapiresponsestatedumped.md)<!-- -->, [AdminApiResponseStorageInfo](./tryorama.adminapiresponsestorageinfo.md)<!-- -->, [AdminApiResponseAppAuthenticationTokenIssued](./tryorama.adminapiresponseappauthenticationtokenissued.md)<!-- -->, [AdminApiResponseZomeCallCapabilityGranted](./tryorama.adminapiresponsezomecallcapabilitygranted.md)
+**References:** [AdminApiResponseAgentInfo](./tryorama.adminapiresponseagentinfo.md)<!-- -->, [AdminApiResponseAgentInfoAdded](./tryorama.adminapiresponseagentinfoadded.md)<!-- -->, [AdminApiResponseAgentPubKeyGenerated](./tryorama.adminapiresponseagentpubkeygenerated.md)<!-- -->, [AdminApiResponseAppDisabled](./tryorama.adminapiresponseappdisabled.md)<!-- -->, [AdminApiResponseAppEnabled](./tryorama.adminapiresponseappenabled.md)<!-- -->, [AdminApiResponseAppInstalled](./tryorama.adminapiresponseappinstalled.md)<!-- -->, [AdminApiResponseAppInterfaceAttached](./tryorama.adminapiresponseappinterfaceattached.md)<!-- -->, [AdminApiResponseAppInterfacesListed](./tryorama.adminapiresponseappinterfaceslisted.md)<!-- -->, [AdminApiResponseAppStarted](./tryorama.adminapiresponseappstarted.md)<!-- -->, [AdminApiResponseAppUninstalled](./tryorama.adminapiresponseappuninstalled.md)<!-- -->, [AdminApiResponseAppsListed](./tryorama.adminapiresponseappslisted.md)<!-- -->, [AdminApiResponseCellIdsListed](./tryorama.adminapiresponsecellidslisted.md)<!-- -->, [AdminApiResponseCloneCellDeleted](./tryorama.adminapiresponseclonecelldeleted.md)<!-- -->, [AdminApiResponseCoordinatorsUpdated](./tryorama.adminapiresponsecoordinatorsupdated.md)<!-- -->, [AdminApiResponseDnasDefinitionReturned](./tryorama.adminapiresponsednasdefinitionreturned.md)<!-- -->, [AdminApiResponseGetCompatibleCells](./tryorama.adminapiresponsegetcompatiblecells.md)<!-- -->, [AdminApiResponseDnasListed](./tryorama.adminapiresponsednaslisted.md)<!-- -->, [AdminApiResponseDnaRegistered](./tryorama.adminapiresponsednaregistered.md)<!-- -->, [AdminApiResponseFullStateDumped](./tryorama.adminapiresponsefullstatedumped.md)<!-- -->, [AdminApiResponseNetworkStatsDumped](./tryorama.adminapiresponsenetworkstatsdumped.md)<!-- -->, [AdminApiResponseAgentKeyRevoked](./tryorama.adminapiresponseagentkeyrevoked.md)<!-- -->, [AdminApiResponseStateDumped](./tryorama.adminapiresponsestatedumped.md)<!-- -->, [AdminApiResponseStorageInfo](./tryorama.adminapiresponsestorageinfo.md)<!-- -->, [AdminApiResponseAppAuthenticationTokenIssued](./tryorama.adminapiresponseappauthenticationtokenissued.md)<!-- -->, [AdminApiResponseZomeCallCapabilityGranted](./tryorama.adminapiresponsezomecallcapabilitygranted.md)
 

docs/tryorama.adminapiresponseagentkeyrevoked.data.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@holochain/tryorama](./tryorama.md) &gt; [AdminApiResponseAgentKeyRevoked](./tryorama.adminapiresponseagentkeyrevoked.md) &gt; [data](./tryorama.adminapiresponseagentkeyrevoked.data.md)
+
+## AdminApiResponseAgentKeyRevoked.data property
+
+**Signature:**
+
+```typescript
+data: RevokeAgentKeyResponse;
+```

docs/tryorama.adminapiresponseagentkeyrevoked.md

@@ -0,0 +1,71 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@holochain/tryorama](./tryorama.md) &gt; [AdminApiResponseAgentKeyRevoked](./tryorama.adminapiresponseagentkeyrevoked.md)
+
+## AdminApiResponseAgentKeyRevoked interface
+
+
+**Signature:**
+
+```typescript
+export interface AdminApiResponseAgentKeyRevoked 
+```
+
+## Properties
+
+<table><thead><tr><th>
+
+Property
+
+
+</th><th>
+
+Modifiers
+
+
+</th><th>
+
+Type
+
+
+</th><th>
+
+Description
+
+
+</th></tr></thead>
+<tbody><tr><td>
+
+[data](./tryorama.adminapiresponseagentkeyrevoked.data.md)
+
+
+</td><td>
+
+
+</td><td>
+
+RevokeAgentKeyResponse
+
+
+</td><td>
+
+
+</td></tr>
+<tr><td>
+
+[type](./tryorama.adminapiresponseagentkeyrevoked.type.md)
+
+
+</td><td>
+
+
+</td><td>
+
+"agent\_key\_revoked"
+
+
+</td><td>
+
+
+</td></tr>
+</tbody></table>

docs/tryorama.adminapiresponseagentkeyrevoked.type.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@holochain/tryorama](./tryorama.md) &gt; [AdminApiResponseAgentKeyRevoked](./tryorama.adminapiresponseagentkeyrevoked.md) &gt; [type](./tryorama.adminapiresponseagentkeyrevoked.type.md)
+
+## AdminApiResponseAgentKeyRevoked.type property
+
+**Signature:**
+
+```typescript
+type: "agent_key_revoked";
+```

docs/tryorama.conductoroptions.md

@@ -71,25 +71,6 @@ _(Optional)_ A bootstrap server URL for peers to discover each other.
 _(Optional)_ The network type the conductor should use.
 
 
-</td></tr>
-<tr><td>
-
-[noDpki?](./tryorama.conductoroptions.nodpki.md)
-
-
-</td><td>
-
-
-</td><td>
-
-boolean
-
-
-</td><td>
-
-_(Optional)_ Exclude dpki in the conductor instance.
-
-
 </td></tr>
 <tr><td>
 

docs/tryorama.createconductoroptions.md

@@ -9,7 +9,7 @@ Options for using the conductor factory.
 **Signature:**
 
 ```typescript
-export type CreateConductorOptions = Pick<ConductorOptions, "bootstrapServerUrl" | "networkType" | "noDpki" | "timeout">;
+export type CreateConductorOptions = Pick<ConductorOptions, "bootstrapServerUrl" | "networkType" | "timeout">;
 ```
 **References:** [ConductorOptions](./tryorama.conductoroptions.md)
 

docs/tryorama.md

@@ -335,6 +335,16 @@ Description
 
 
 
+</td></tr>
+<tr><td>
+
+[AdminApiResponseAgentKeyRevoked](./tryorama.adminapiresponseagentkeyrevoked.md)
+
+
+</td><td>
+
+
+
 </td></tr>
 <tr><td>
 

docs/tryorama.requestadmininterfacemessage.data.md

@@ -7,5 +7,5 @@
 **Signature:**
 
 ```typescript
-data?: AddAgentInfoRequest | AgentInfoRequest | AttachAppInterfaceRequest | DeleteCloneCellRequest | DisableAppRequest | DumpFullStateRequest | DumpNetworkStatsRequest | DumpStateRequest | EnableAppRequest | GetCompatibleCellsRequest | GetDnaDefinitionRequest | GrantZomeCallCapabilityRequest | InstallAppRequest | ListAppsRequest | RegisterDnaRequest | StartAppRequest | StorageInfoRequest | UninstallAppRequest | UpdateCoordinatorsRequest | IssueAppAuthenticationTokenRequest;
+data?: AddAgentInfoRequest | AgentInfoRequest | AttachAppInterfaceRequest | DeleteCloneCellRequest | DisableAppRequest | DumpFullStateRequest | DumpNetworkStatsRequest | DumpStateRequest | EnableAppRequest | GetCompatibleCellsRequest | GetDnaDefinitionRequest | GrantZomeCallCapabilityRequest | InstallAppRequest | ListAppsRequest | RegisterDnaRequest | RevokeAgentKeyRequest | StartAppRequest | StorageInfoRequest | UninstallAppRequest | UpdateCoordinatorsRequest | IssueAppAuthenticationTokenRequest;
 ```

docs/tryorama.requestadmininterfacemessage.md

@@ -45,7 +45,7 @@ Description
 
 </td><td>
 
-AddAgentInfoRequest \| AgentInfoRequest \| AttachAppInterfaceRequest \| DeleteCloneCellRequest \| DisableAppRequest \| DumpFullStateRequest \| DumpNetworkStatsRequest \| DumpStateRequest \| EnableAppRequest \| GetCompatibleCellsRequest \| GetDnaDefinitionRequest \| GrantZomeCallCapabilityRequest \| InstallAppRequest \| ListAppsRequest \| RegisterDnaRequest \| StartAppRequest \| StorageInfoRequest \| UninstallAppRequest \| UpdateCoordinatorsRequest \| IssueAppAuthenticationTokenRequest
+AddAgentInfoRequest \| AgentInfoRequest \| AttachAppInterfaceRequest \| DeleteCloneCellRequest \| DisableAppRequest \| DumpFullStateRequest \| DumpNetworkStatsRequest \| DumpStateRequest \| EnableAppRequest \| GetCompatibleCellsRequest \| GetDnaDefinitionRequest \| GrantZomeCallCapabilityRequest \| InstallAppRequest \| ListAppsRequest \| RegisterDnaRequest \| RevokeAgentKeyRequest \| StartAppRequest \| StorageInfoRequest \| UninstallAppRequest \| UpdateCoordinatorsRequest \| IssueAppAuthenticationTokenRequest
 
 
 </td><td>

docs/tryorama.requestadmininterfacemessagetype.md

@@ -9,5 +9,5 @@ The types of all possible calls to the Admin API.
 **Signature:**
 
 ```typescript
-export type RequestAdminInterfaceMessageType = "add_agent_info" | "agent_info" | "attach_app_interface" | "connect_app_interface" | "delete_clone_cell" | "disable_app" | "dump_full_state" | "dump_network_stats" | "dump_state" | "enable_app" | "generate_agent_pub_key" | "get_compatible_cells" | "get_dna_definition" | "grant_zome_call_capability" | "install_app" | "list_apps" | "list_app_interfaces" | "list_cell_ids" | "list_dnas" | "register_dna" | "start_app" | "storage_info" | "uninstall_app" | "update_coordinators" | "issue_app_authentication_token";
+export type RequestAdminInterfaceMessageType = "add_agent_info" | "agent_info" | "attach_app_interface" | "connect_app_interface" | "delete_clone_cell" | "disable_app" | "dump_full_state" | "dump_network_stats" | "dump_state" | "enable_app" | "generate_agent_pub_key" | "get_compatible_cells" | "get_dna_definition" | "grant_zome_call_capability" | "install_app" | "list_apps" | "list_app_interfaces" | "list_cell_ids" | "list_dnas" | "register_dna" | "revoke_agent_key" | "start_app" | "storage_info" | "uninstall_app" | "update_coordinators" | "issue_app_authentication_token";
 ```

docs/tryorama.scenario.dpkinetworkseed.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@holochain/tryorama](./tryorama.md) &gt; [Scenario](./tryorama.scenario.md) &gt; [dpkiNetworkSeed](./tryorama.scenario.dpkinetworkseed.md)
+
+## Scenario.dpkiNetworkSeed property
+
+**Signature:**
+
+```typescript
+dpkiNetworkSeed: string;
+```