Merge pull-request #65

README.md

@@ -64,6 +64,8 @@ go install github.com/go-swagger/go-swagger/cmd/[email protected]
 2. Update the swagger file in `api/` with a new one
 3. Run `make generate`
 
+Note: depending on how you downloaded, your `go-swagger` may be located in a few locations such as `/Users/<your username>/go/bin/swagger` or `/opt/homebrew/bin/swagger`. If both are present, we would recommend using the former, for better version granularity
+
 ### Custom Templates
 While custom templates should be avoided where possible, sometimes it's worth the extra maintenance burden to provide a more streamlined UX. To use a custom template, copy the original template from the [go-swagger repo](https://github.com/go-swagger/go-swagger) to the `templates` directory
 

api/public_api.swagger.json

@@ -1185,7 +1185,7 @@
     },
     "/public/v1/submit/delete_private_keys": {
       "post": {
-        "summary": "Delete organization private keys",
+        "summary": "Delete Private Keys",
         "description": "Deletes private keys for an organization",
         "operationId": "DeletePrivateKeys",
         "responses": {
@@ -1209,6 +1209,32 @@
         "tags": ["Private Keys"]
       }
     },
+    "/public/v1/submit/delete_sub_organization": {
+      "post": {
+        "summary": "Delete Sub Organization",
+        "description": "Deletes a sub organization",
+        "operationId": "DeleteSubOrganization",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/ActivityResponse"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/DeleteSubOrganizationRequest"
+            }
+          }
+        ],
+        "tags": ["Organizations"]
+      }
+    },
     "/public/v1/submit/delete_user_tags": {
       "post": {
         "summary": "Delete User Tags",
@@ -1263,7 +1289,7 @@
     },
     "/public/v1/submit/delete_wallets": {
       "post": {
-        "summary": "Delete organization wallets",
+        "summary": "Delete Wallets",
         "description": "Deletes wallets for an organization",
         "operationId": "DeleteWallets",
         "responses": {
@@ -2104,7 +2130,8 @@
         "ACTIVITY_TYPE_CREATE_SUB_ORGANIZATION_V6",
         "ACTIVITY_TYPE_DELETE_PRIVATE_KEYS",
         "ACTIVITY_TYPE_DELETE_WALLETS",
-        "ACTIVITY_TYPE_CREATE_READ_WRITE_SESSION_V2"
+        "ACTIVITY_TYPE_CREATE_READ_WRITE_SESSION_V2",
+        "ACTIVITY_TYPE_DELETE_SUB_ORGANIZATION"
       ]
     },
     "AddressFormat": {
@@ -2115,7 +2142,29 @@
         "ADDRESS_FORMAT_ETHEREUM",
         "ADDRESS_FORMAT_SOLANA",
         "ADDRESS_FORMAT_COSMOS",
-        "ADDRESS_FORMAT_TRON"
+        "ADDRESS_FORMAT_TRON",
+        "ADDRESS_FORMAT_SUI",
+        "ADDRESS_FORMAT_APTOS",
+        "ADDRESS_FORMAT_BITCOIN_MAINNET_P2PKH",
+        "ADDRESS_FORMAT_BITCOIN_MAINNET_P2SH",
+        "ADDRESS_FORMAT_BITCOIN_MAINNET_P2WPKH",
+        "ADDRESS_FORMAT_BITCOIN_MAINNET_P2WSH",
+        "ADDRESS_FORMAT_BITCOIN_MAINNET_P2TR",
+        "ADDRESS_FORMAT_BITCOIN_TESTNET_P2PKH",
+        "ADDRESS_FORMAT_BITCOIN_TESTNET_P2SH",
+        "ADDRESS_FORMAT_BITCOIN_TESTNET_P2WPKH",
+        "ADDRESS_FORMAT_BITCOIN_TESTNET_P2WSH",
+        "ADDRESS_FORMAT_BITCOIN_TESTNET_P2TR",
+        "ADDRESS_FORMAT_BITCOIN_SIGNET_P2PKH",
+        "ADDRESS_FORMAT_BITCOIN_SIGNET_P2SH",
+        "ADDRESS_FORMAT_BITCOIN_SIGNET_P2WPKH",
+        "ADDRESS_FORMAT_BITCOIN_SIGNET_P2WSH",
+        "ADDRESS_FORMAT_BITCOIN_SIGNET_P2TR",
+        "ADDRESS_FORMAT_BITCOIN_REGTEST_P2PKH",
+        "ADDRESS_FORMAT_BITCOIN_REGTEST_P2SH",
+        "ADDRESS_FORMAT_BITCOIN_REGTEST_P2WPKH",
+        "ADDRESS_FORMAT_BITCOIN_REGTEST_P2WSH",
+        "ADDRESS_FORMAT_BITCOIN_REGTEST_P2TR"
       ]
     },
     "Any": {
@@ -3154,7 +3203,7 @@
           "description": "Expiration window (in seconds) indicating how long the API key is valid. If not provided, a default of 15 minutes will be used."
         }
       },
-      "required": ["targetPublicKey", "userId"]
+      "required": ["targetPublicKey"]
     },
     "CreateReadWriteSessionRequest": {
       "type": "object",
@@ -4176,6 +4225,46 @@
       },
       "required": ["privateKeyIds"]
     },
+    "DeleteSubOrganizationIntent": {
+      "type": "object",
+      "properties": {
+        "deleteWithoutExport": {
+          "type": "boolean",
+          "description": "Sub-organization deletion, by default, requires associated wallets and private keys to be exported for security reasons. Set this boolean to true to force sub-organization deletion even if some wallets or private keys within it have not been exported yet. Default: false."
+        }
+      }
+    },
+    "DeleteSubOrganizationRequest": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": ["ACTIVITY_TYPE_DELETE_SUB_ORGANIZATION"]
+        },
+        "timestampMs": {
+          "type": "string",
+          "description": "Timestamp (in milliseconds) of the request, used to verify liveness of user requests."
+        },
+        "organizationId": {
+          "type": "string",
+          "description": "Unique identifier for a given Organization."
+        },
+        "parameters": {
+          "$ref": "#/definitions/DeleteSubOrganizationIntent"
+        }
+      },
+      "required": ["type", "timestampMs", "organizationId", "parameters"]
+    },
+    "DeleteSubOrganizationResult": {
+      "type": "object",
+      "properties": {
+        "subOrganizationUuid": {
+          "type": "string",
+          "description": "Unique identifier of the sub organization that was removed"
+        }
+      },
+      "required": ["subOrganizationUuid"]
+    },
     "DeleteUserTagsIntent": {
       "type": "object",
       "properties": {
@@ -5652,6 +5741,9 @@
         },
         "createReadWriteSessionIntentV2": {
           "$ref": "#/definitions/CreateReadWriteSessionIntentV2"
+        },
+        "deleteSubOrganizationIntent": {
+          "$ref": "#/definitions/DeleteSubOrganizationIntent"
         }
       }
     },
@@ -6399,6 +6491,9 @@
         },
         "createReadWriteSessionResultV2": {
           "$ref": "#/definitions/CreateReadWriteSessionResultV2"
+        },
+        "deleteSubOrganizationResult": {
+          "$ref": "#/definitions/DeleteSubOrganizationResult"
         }
       }
     },
@@ -6905,7 +7000,7 @@
     },
     "TransactionType": {
       "type": "string",
-      "enum": ["TRANSACTION_TYPE_ETHEREUM"]
+      "enum": ["TRANSACTION_TYPE_ETHEREUM", "TRANSACTION_TYPE_SOLANA"]
     },
     "UpdateAllowedOriginsIntent": {
       "type": "object",