diff --git a/docs/.openapi-generator/FILES b/docs/.openapi-generator/FILES index c0077bf9..c8b13ed9 100644 --- a/docs/.openapi-generator/FILES +++ b/docs/.openapi-generator/FILES @@ -43,6 +43,7 @@ Models/AuthSpec_oneOf_2.md Models/AuthSpec_oneOf_3.md Models/AwsKmsSignerRequestConfig.md Models/BalanceResponse.md +Models/CdpSignerRequestConfig.md Models/ContractSource.md Models/ContractSource_oneOf.md Models/ContractSource_oneOf_1.md @@ -135,6 +136,7 @@ Models/SignerConfigResponse_oneOf_1.md Models/SignerConfigResponse_oneOf_2.md Models/SignerConfigResponse_oneOf_3.md Models/SignerConfigResponse_oneOf_4.md +Models/SignerConfigResponse_oneOf_5.md Models/SignerCreateRequest.md Models/SignerResponse.md Models/SignerType.md diff --git a/docs/Models/ApiResponse_TransactionResponse_data.md b/docs/Models/ApiResponse_TransactionResponse_data.md index 24b0bea6..c95ca4a8 100644 --- a/docs/Models/ApiResponse_TransactionResponse_data.md +++ b/docs/Models/ApiResponse_TransactionResponse_data.md @@ -8,11 +8,11 @@ | **data** | **String** | | [optional] [default to null] | | **from** | **String** | | [default to null] | | **gas\_limit** | **Long** | | [optional] [default to null] | -| **gas\_price** | **Integer** | | [optional] [default to null] | +| **gas\_price** | **String** | | [optional] [default to null] | | **hash** | **String** | | [optional] [default to null] | | **id** | **String** | | [default to null] | -| **max\_fee\_per\_gas** | **Integer** | | [optional] [default to null] | -| **max\_priority\_fee\_per\_gas** | **Integer** | | [optional] [default to null] | +| **max\_fee\_per\_gas** | **String** | | [optional] [default to null] | +| **max\_priority\_fee\_per\_gas** | **String** | | [optional] [default to null] | | **nonce** | **Long** | | [optional] [default to null] | | **relayer\_id** | **String** | | [default to null] | | **sent\_at** | **String** | | [optional] [default to null] | diff --git a/docs/Models/CdpSignerRequestConfig.md b/docs/Models/CdpSignerRequestConfig.md new file mode 100644 index 00000000..b71a46f4 --- /dev/null +++ b/docs/Models/CdpSignerRequestConfig.md @@ -0,0 +1,12 @@ +# CdpSignerRequestConfig +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +| **account\_address** | **String** | | [default to null] | +| **api\_key\_id** | **String** | | [default to null] | +| **api\_key\_secret** | **String** | | [default to null] | +| **wallet\_secret** | **String** | | [default to null] | + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/docs/Models/EvmTransactionResponse.md b/docs/Models/EvmTransactionResponse.md index 2563cab5..7581e660 100644 --- a/docs/Models/EvmTransactionResponse.md +++ b/docs/Models/EvmTransactionResponse.md @@ -8,11 +8,11 @@ | **data** | **String** | | [optional] [default to null] | | **from** | **String** | | [default to null] | | **gas\_limit** | **Long** | | [optional] [default to null] | -| **gas\_price** | **Integer** | | [optional] [default to null] | +| **gas\_price** | **String** | | [optional] [default to null] | | **hash** | **String** | | [optional] [default to null] | | **id** | **String** | | [default to null] | -| **max\_fee\_per\_gas** | **Integer** | | [optional] [default to null] | -| **max\_priority\_fee\_per\_gas** | **Integer** | | [optional] [default to null] | +| **max\_fee\_per\_gas** | **String** | | [optional] [default to null] | +| **max\_priority\_fee\_per\_gas** | **String** | | [optional] [default to null] | | **nonce** | **Long** | | [optional] [default to null] | | **relayer\_id** | **String** | | [default to null] | | **sent\_at** | **String** | | [optional] [default to null] | diff --git a/docs/Models/SignerConfigRequest.md b/docs/Models/SignerConfigRequest.md index 32bc194b..91606f4b 100644 --- a/docs/Models/SignerConfigRequest.md +++ b/docs/Models/SignerConfigRequest.md @@ -18,6 +18,10 @@ | **organization\_id** | **String** | | [default to null] | | **private\_key\_id** | **String** | | [default to null] | | **public\_key** | **String** | | [default to null] | +| **account\_address** | **String** | | [default to null] | +| **api\_key\_id** | **String** | | [default to null] | +| **api\_key\_secret** | **String** | | [default to null] | +| **wallet\_secret** | **String** | | [default to null] | | **service\_account** | [**GoogleCloudKmsSignerServiceAccountRequestConfig**](GoogleCloudKmsSignerServiceAccountRequestConfig.md) | | [default to null] | [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/Models/SignerConfigResponse.md b/docs/Models/SignerConfigResponse.md index 5d807cef..7ec38ff1 100644 --- a/docs/Models/SignerConfigResponse.md +++ b/docs/Models/SignerConfigResponse.md @@ -14,6 +14,8 @@ | **organization\_id** | **String** | | [default to null] | | **private\_key\_id** | **String** | | [default to null] | | **public\_key** | **String** | | [default to null] | +| **account\_address** | **String** | | [default to null] | +| **api\_key\_id** | **String** | | [default to null] | | **key** | [**GoogleCloudKmsSignerKeyResponseConfig**](GoogleCloudKmsSignerKeyResponseConfig.md) | | [default to null] | | **service\_account** | [**GoogleCloudKmsSignerServiceAccountResponseConfig**](GoogleCloudKmsSignerServiceAccountResponseConfig.md) | | [default to null] | diff --git a/docs/Models/SignerConfigResponse_oneOf_4.md b/docs/Models/SignerConfigResponse_oneOf_4.md index f278d88e..f9c7f7ae 100644 --- a/docs/Models/SignerConfigResponse_oneOf_4.md +++ b/docs/Models/SignerConfigResponse_oneOf_4.md @@ -3,8 +3,8 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **key** | [**GoogleCloudKmsSignerKeyResponseConfig**](GoogleCloudKmsSignerKeyResponseConfig.md) | | [default to null] | -| **service\_account** | [**GoogleCloudKmsSignerServiceAccountResponseConfig**](GoogleCloudKmsSignerServiceAccountResponseConfig.md) | | [default to null] | +| **account\_address** | **String** | | [default to null] | +| **api\_key\_id** | **String** | | [default to null] | [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/Models/SignerConfigResponse_oneOf_5.md b/docs/Models/SignerConfigResponse_oneOf_5.md new file mode 100644 index 00000000..74c6672a --- /dev/null +++ b/docs/Models/SignerConfigResponse_oneOf_5.md @@ -0,0 +1,10 @@ +# SignerConfigResponse_oneOf_5 +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +| **key** | [**GoogleCloudKmsSignerKeyResponseConfig**](GoogleCloudKmsSignerKeyResponseConfig.md) | | [default to null] | +| **service\_account** | [**GoogleCloudKmsSignerServiceAccountResponseConfig**](GoogleCloudKmsSignerServiceAccountResponseConfig.md) | | [default to null] | + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/docs/Models/TransactionResponse.md b/docs/Models/TransactionResponse.md index 2edb2f28..4bd1e323 100644 --- a/docs/Models/TransactionResponse.md +++ b/docs/Models/TransactionResponse.md @@ -8,11 +8,11 @@ | **data** | **String** | | [optional] [default to null] | | **from** | **String** | | [default to null] | | **gas\_limit** | **Long** | | [optional] [default to null] | -| **gas\_price** | **Integer** | | [optional] [default to null] | +| **gas\_price** | **String** | | [optional] [default to null] | | **hash** | **String** | | [optional] [default to null] | | **id** | **String** | | [default to null] | -| **max\_fee\_per\_gas** | **Integer** | | [optional] [default to null] | -| **max\_priority\_fee\_per\_gas** | **Integer** | | [optional] [default to null] | +| **max\_fee\_per\_gas** | **String** | | [optional] [default to null] | +| **max\_priority\_fee\_per\_gas** | **String** | | [optional] [default to null] | | **nonce** | **Long** | | [optional] [default to null] | | **relayer\_id** | **String** | | [default to null] | | **sent\_at** | **String** | | [optional] [default to null] | diff --git a/docs/README.md b/docs/README.md index 84eed7ca..c7f12d86 100644 --- a/docs/README.md +++ b/docs/README.md @@ -84,6 +84,7 @@ All URIs are relative to *http://localhost* - [AuthSpec_oneOf_3](./Models/AuthSpec_oneOf_3.md) - [AwsKmsSignerRequestConfig](./Models/AwsKmsSignerRequestConfig.md) - [BalanceResponse](./Models/BalanceResponse.md) + - [CdpSignerRequestConfig](./Models/CdpSignerRequestConfig.md) - [ContractSource](./Models/ContractSource.md) - [ContractSource_oneOf](./Models/ContractSource_oneOf.md) - [ContractSource_oneOf_1](./Models/ContractSource_oneOf_1.md) @@ -176,6 +177,7 @@ All URIs are relative to *http://localhost* - [SignerConfigResponse_oneOf_2](./Models/SignerConfigResponse_oneOf_2.md) - [SignerConfigResponse_oneOf_3](./Models/SignerConfigResponse_oneOf_3.md) - [SignerConfigResponse_oneOf_4](./Models/SignerConfigResponse_oneOf_4.md) + - [SignerConfigResponse_oneOf_5](./Models/SignerConfigResponse_oneOf_5.md) - [SignerCreateRequest](./Models/SignerCreateRequest.md) - [SignerResponse](./Models/SignerResponse.md) - [SignerType](./Models/SignerType.md) diff --git a/openapi.json b/openapi.json index 60330187..92cfa64e 100644 --- a/openapi.json +++ b/openapi.json @@ -4274,6 +4274,31 @@ } } }, + "CdpSignerRequestConfig": { + "type": "object", + "description": "CDP signer configuration for API requests", + "required": [ + "api_key_id", + "api_key_secret", + "wallet_secret", + "account_address" + ], + "properties": { + "account_address": { + "type": "string" + }, + "api_key_id": { + "type": "string" + }, + "api_key_secret": { + "type": "string" + }, + "wallet_secret": { + "type": "string" + } + }, + "additionalProperties": false + }, "ContractSource": { "oneOf": [ { @@ -4601,8 +4626,7 @@ "minimum": 0 }, "gas_price": { - "type": "integer", - "minimum": 0 + "type": "string" }, "hash": { "type": "string" @@ -4611,12 +4635,10 @@ "type": "string" }, "max_fee_per_gas": { - "type": "integer", - "minimum": 0 + "type": "string" }, "max_priority_fee_per_gas": { - "type": "integer", - "minimum": 0 + "type": "string" }, "nonce": { "type": "integer", @@ -6284,6 +6306,9 @@ { "$ref": "#/components/schemas/TurnkeySignerRequestConfig" }, + { + "$ref": "#/components/schemas/CdpSignerRequestConfig" + }, { "$ref": "#/components/schemas/GoogleCloudKmsSignerRequestConfig" } @@ -6390,6 +6415,21 @@ } } }, + { + "type": "object", + "required": [ + "api_key_id", + "account_address" + ], + "properties": { + "account_address": { + "type": "string" + }, + "api_key_id": { + "type": "string" + } + } + }, { "type": "object", "required": [ @@ -6465,7 +6505,8 @@ "google_cloud_kms", "vault", "vault_transit", - "turnkey" + "turnkey", + "cdp" ] }, "SignerTypeRequest": { @@ -6477,6 +6518,7 @@ "vault", "vault_transit", "turnkey", + "cdp", "google_cloud_kms" ] }, @@ -7413,4 +7455,4 @@ "description": "Health is responsible for showing the health of the relayers." } ] -} \ No newline at end of file +} diff --git a/package.json b/package.json index 49cf3352..ad44fb6f 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "generate:docs": "pnpm openapi-generator-cli generate -i ./openapi.json -g markdown -o docs", "post:generate:client": "node scripts/post-generate.js", "build:client": "pnpm clean:dist && tsc -p tsconfig.build.json && tsc -p tsconfig.build.esm.json", - "generate": "pnpm generate:client && pnpm post:generate:client && pnpm build:client", + "generate": "pnpm generate:client && pnpm post:generate:client && pnpm build:client && pnpm generate:docs", "prepare": "husky", "pre-commit": "lint-staged", "lint": "prettier --check --write .", diff --git a/src/.openapi-generator/FILES b/src/.openapi-generator/FILES index 3a5ebe25..f954dbc1 100644 --- a/src/.openapi-generator/FILES +++ b/src/.openapi-generator/FILES @@ -53,6 +53,7 @@ models/auth-spec-one-of3.ts models/auth-spec.ts models/aws-kms-signer-request-config.ts models/balance-response.ts +models/cdp-signer-request-config.ts models/contract-source-one-of.ts models/contract-source-one-of1.ts models/contract-source.ts @@ -145,6 +146,7 @@ models/signer-config-response-one-of1.ts models/signer-config-response-one-of2.ts models/signer-config-response-one-of3.ts models/signer-config-response-one-of4.ts +models/signer-config-response-one-of5.ts models/signer-config-response.ts models/signer-create-request.ts models/signer-response.ts diff --git a/src/models/cdp-signer-request-config.ts b/src/models/cdp-signer-request-config.ts new file mode 100644 index 00000000..ab768c00 --- /dev/null +++ b/src/models/cdp-signer-request-config.ts @@ -0,0 +1,48 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * OpenZeppelin Relayer API + * OpenZeppelin Relayer API + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + + +/** + * CDP signer configuration for API requests + * @export + * @interface CdpSignerRequestConfig + */ +export interface CdpSignerRequestConfig { + /** + * + * @type {string} + * @memberof CdpSignerRequestConfig + */ + 'account_address': string; + /** + * + * @type {string} + * @memberof CdpSignerRequestConfig + */ + 'api_key_id': string; + /** + * + * @type {string} + * @memberof CdpSignerRequestConfig + */ + 'api_key_secret': string; + /** + * + * @type {string} + * @memberof CdpSignerRequestConfig + */ + 'wallet_secret': string; +} + diff --git a/src/models/evm-transaction-response.ts b/src/models/evm-transaction-response.ts index d8975d92..eacbe6de 100644 --- a/src/models/evm-transaction-response.ts +++ b/src/models/evm-transaction-response.ts @@ -61,10 +61,10 @@ export interface EvmTransactionResponse { 'gas_limit'?: number | null; /** * - * @type {number} + * @type {string} * @memberof EvmTransactionResponse */ - 'gas_price'?: number; + 'gas_price'?: string; /** * * @type {string} @@ -79,16 +79,16 @@ export interface EvmTransactionResponse { 'id': string; /** * - * @type {number} + * @type {string} * @memberof EvmTransactionResponse */ - 'max_fee_per_gas'?: number; + 'max_fee_per_gas'?: string; /** * - * @type {number} + * @type {string} * @memberof EvmTransactionResponse */ - 'max_priority_fee_per_gas'?: number; + 'max_priority_fee_per_gas'?: string; /** * * @type {number} diff --git a/src/models/index.ts b/src/models/index.ts index 639be2f5..97ed6208 100644 --- a/src/models/index.ts +++ b/src/models/index.ts @@ -37,6 +37,7 @@ export * from './auth-spec-one-of2'; export * from './auth-spec-one-of3'; export * from './aws-kms-signer-request-config'; export * from './balance-response'; +export * from './cdp-signer-request-config'; export * from './contract-source'; export * from './contract-source-one-of'; export * from './contract-source-one-of1'; @@ -129,6 +130,7 @@ export * from './signer-config-response-one-of1'; export * from './signer-config-response-one-of2'; export * from './signer-config-response-one-of3'; export * from './signer-config-response-one-of4'; +export * from './signer-config-response-one-of5'; export * from './signer-create-request'; export * from './signer-response'; export * from './signer-type'; diff --git a/src/models/signer-config-request.ts b/src/models/signer-config-request.ts index 345ffda6..0fac202f 100644 --- a/src/models/signer-config-request.ts +++ b/src/models/signer-config-request.ts @@ -18,6 +18,9 @@ import type { AwsKmsSignerRequestConfig } from './aws-kms-signer-request-config'; // May contain unused imports in some cases // @ts-ignore +import type { CdpSignerRequestConfig } from './cdp-signer-request-config'; +// May contain unused imports in some cases +// @ts-ignore import type { GoogleCloudKmsSignerKeyRequestConfig } from './google-cloud-kms-signer-key-request-config'; // May contain unused imports in some cases // @ts-ignore @@ -43,6 +46,6 @@ import type { VaultTransitSignerRequestConfig } from './vault-transit-signer-req * Signer configuration enum for API requests (without type discriminator) * @export */ -export type SignerConfigRequest = AwsKmsSignerRequestConfig | GoogleCloudKmsSignerRequestConfig | LocalSignerRequestConfig | TurnkeySignerRequestConfig | VaultSignerRequestConfig | VaultTransitSignerRequestConfig; +export type SignerConfigRequest = AwsKmsSignerRequestConfig | CdpSignerRequestConfig | GoogleCloudKmsSignerRequestConfig | LocalSignerRequestConfig | TurnkeySignerRequestConfig | VaultSignerRequestConfig | VaultTransitSignerRequestConfig; diff --git a/src/models/signer-config-response-one-of4.ts b/src/models/signer-config-response-one-of4.ts index 2bbb6192..507ef1a7 100644 --- a/src/models/signer-config-response-one-of4.ts +++ b/src/models/signer-config-response-one-of4.ts @@ -13,12 +13,6 @@ */ -// May contain unused imports in some cases -// @ts-ignore -import type { GoogleCloudKmsSignerKeyResponseConfig } from './google-cloud-kms-signer-key-response-config'; -// May contain unused imports in some cases -// @ts-ignore -import type { GoogleCloudKmsSignerServiceAccountResponseConfig } from './google-cloud-kms-signer-service-account-response-config'; /** * @@ -28,15 +22,15 @@ import type { GoogleCloudKmsSignerServiceAccountResponseConfig } from './google- export interface SignerConfigResponseOneOf4 { /** * - * @type {GoogleCloudKmsSignerKeyResponseConfig} + * @type {string} * @memberof SignerConfigResponseOneOf4 */ - 'key': GoogleCloudKmsSignerKeyResponseConfig; + 'account_address': string; /** * - * @type {GoogleCloudKmsSignerServiceAccountResponseConfig} + * @type {string} * @memberof SignerConfigResponseOneOf4 */ - 'service_account': GoogleCloudKmsSignerServiceAccountResponseConfig; + 'api_key_id': string; } diff --git a/src/models/signer-config-response-one-of5.ts b/src/models/signer-config-response-one-of5.ts new file mode 100644 index 00000000..2f47ab91 --- /dev/null +++ b/src/models/signer-config-response-one-of5.ts @@ -0,0 +1,42 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * OpenZeppelin Relayer API + * OpenZeppelin Relayer API + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +// May contain unused imports in some cases +// @ts-ignore +import type { GoogleCloudKmsSignerKeyResponseConfig } from './google-cloud-kms-signer-key-response-config'; +// May contain unused imports in some cases +// @ts-ignore +import type { GoogleCloudKmsSignerServiceAccountResponseConfig } from './google-cloud-kms-signer-service-account-response-config'; + +/** + * + * @export + * @interface SignerConfigResponseOneOf5 + */ +export interface SignerConfigResponseOneOf5 { + /** + * + * @type {GoogleCloudKmsSignerKeyResponseConfig} + * @memberof SignerConfigResponseOneOf5 + */ + 'key': GoogleCloudKmsSignerKeyResponseConfig; + /** + * + * @type {GoogleCloudKmsSignerServiceAccountResponseConfig} + * @memberof SignerConfigResponseOneOf5 + */ + 'service_account': GoogleCloudKmsSignerServiceAccountResponseConfig; +} + diff --git a/src/models/signer-config-response.ts b/src/models/signer-config-response.ts index 395c6647..b4310875 100644 --- a/src/models/signer-config-response.ts +++ b/src/models/signer-config-response.ts @@ -34,12 +34,15 @@ import type { SignerConfigResponseOneOf3 } from './signer-config-response-one-of // May contain unused imports in some cases // @ts-ignore import type { SignerConfigResponseOneOf4 } from './signer-config-response-one-of4'; +// May contain unused imports in some cases +// @ts-ignore +import type { SignerConfigResponseOneOf5 } from './signer-config-response-one-of5'; /** * @type SignerConfigResponse * Signer configuration response Does not include sensitive information like private keys * @export */ -export type SignerConfigResponse = SignerConfigResponseOneOf | SignerConfigResponseOneOf1 | SignerConfigResponseOneOf2 | SignerConfigResponseOneOf3 | SignerConfigResponseOneOf4 | object; +export type SignerConfigResponse = SignerConfigResponseOneOf | SignerConfigResponseOneOf1 | SignerConfigResponseOneOf2 | SignerConfigResponseOneOf3 | SignerConfigResponseOneOf4 | SignerConfigResponseOneOf5 | object; diff --git a/src/models/signer-type-request.ts b/src/models/signer-type-request.ts index f4c3fb6e..a5197e1d 100644 --- a/src/models/signer-type-request.ts +++ b/src/models/signer-type-request.ts @@ -26,6 +26,7 @@ export enum SignerTypeRequest { VAULT = 'vault', VAULT_TRANSIT = 'vault_transit', TURNKEY = 'turnkey', + CDP = 'cdp', GOOGLE_CLOUD_KMS = 'google_cloud_kms' } diff --git a/src/models/signer-type.ts b/src/models/signer-type.ts index c76e05b7..3c5616ab 100644 --- a/src/models/signer-type.ts +++ b/src/models/signer-type.ts @@ -26,7 +26,8 @@ export enum SignerType { GOOGLE_CLOUD_KMS = 'google_cloud_kms', VAULT = 'vault', VAULT_TRANSIT = 'vault_transit', - TURNKEY = 'turnkey' + TURNKEY = 'turnkey', + CDP = 'cdp' }