circle-developer-controlled-wallets 0.1.0b1__py3-none-any.whl → 1.1.0__py3-none-any.whl

circle/web3/developer_controlled_wallets/api_client.py

@@ -77,7 +77,7 @@ class ApiClient(object):
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = (user_agent + ' / ' if user_agent else '') + 'CircleWeb3PythonSDK / DeveloperControlledWallets / 0.1.0b1'
+        self.user_agent = (user_agent + ' / ' if user_agent else '') + 'CircleWeb3PythonSDK / DeveloperControlledWallets / 1.1.0'
         self.client_side_validation = configuration.client_side_validation
 
     def __enter__(self):

circle/web3/developer_controlled_wallets/configuration.py

@@ -68,7 +68,7 @@ class Configuration(object):
                  ):
         """Constructor
         """
-        self._base_path = "https://api.circle.com/v1/w3s" if host is None else host
+        self._base_path = "https://api.circle.com" if host is None else host
         """Default Base url
         """
         self.server_index = 0 if server_index is None and host is None else server_index
@@ -383,7 +383,7 @@ class Configuration(object):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 1.0\n"\
-               "SDK Package Version: 0.1.0b1".\
+               "SDK Package Version: 1.1.0".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):
@@ -393,7 +393,7 @@ class Configuration(object):
         """
         return [
             {
-                'url': "https://api.circle.com/v1/w3s",
+                'url': "https://api.circle.com",
                 'description': "No description provided",
             }
         ]

circle/web3/developer_controlled_wallets/models/__init__.py

@@ -14,6 +14,7 @@ from circle.web3.developer_controlled_wallets.models.abi_parameters_inner import
 from circle.web3.developer_controlled_wallets.models.accelerate_transaction_for_developer_request import AccelerateTransactionForDeveloperRequest
 from circle.web3.developer_controlled_wallets.models.accelerate_transaction_for_developer_response import AccelerateTransactionForDeveloperResponse
 from circle.web3.developer_controlled_wallets.models.account_type import AccountType
+from circle.web3.developer_controlled_wallets.models.bad_request_response import BadRequestResponse
 from circle.web3.developer_controlled_wallets.models.balance import Balance
 from circle.web3.developer_controlled_wallets.models.blockchain import Blockchain
 from circle.web3.developer_controlled_wallets.models.cancel_transaction_for_developer_request import CancelTransactionForDeveloperRequest
@@ -24,27 +25,22 @@ from circle.web3.developer_controlled_wallets.models.create_developer_transactio
 from circle.web3.developer_controlled_wallets.models.create_developer_transaction_cancel200_response import CreateDeveloperTransactionCancel200Response
 from circle.web3.developer_controlled_wallets.models.create_developer_transaction_contract_execution200_response import CreateDeveloperTransactionContractExecution200Response
 from circle.web3.developer_controlled_wallets.models.create_developer_transaction_transfer200_response import CreateDeveloperTransactionTransfer200Response
-from circle.web3.developer_controlled_wallets.models.create_developer_wallet200_response import CreateDeveloperWallet200Response
-from circle.web3.developer_controlled_wallets.models.create_developer_wallet_request import CreateDeveloperWalletRequest
-from circle.web3.developer_controlled_wallets.models.create_developer_wallet_response import CreateDeveloperWalletResponse
-from circle.web3.developer_controlled_wallets.models.create_developer_wallet_set_request import CreateDeveloperWalletSetRequest
-from circle.web3.developer_controlled_wallets.models.create_developer_wallet_set_response import CreateDeveloperWalletSetResponse
 from circle.web3.developer_controlled_wallets.models.create_transfer_estimate_fee200_response import CreateTransferEstimateFee200Response
 from circle.web3.developer_controlled_wallets.models.create_transfer_transaction_for_developer_request import CreateTransferTransactionForDeveloperRequest
 from circle.web3.developer_controlled_wallets.models.create_transfer_transaction_for_developer_response import CreateTransferTransactionForDeveloperResponse
 from circle.web3.developer_controlled_wallets.models.create_validate_address200_response import CreateValidateAddress200Response
-from circle.web3.developer_controlled_wallets.models.create_wallet_set200_response import CreateWalletSet200Response
+from circle.web3.developer_controlled_wallets.models.create_wallet_request import CreateWalletRequest
+from circle.web3.developer_controlled_wallets.models.create_wallet_set_request import CreateWalletSetRequest
 from circle.web3.developer_controlled_wallets.models.custody_type import CustodyType
+from circle.web3.developer_controlled_wallets.models.developer_wallet_set import DeveloperWalletSet
+from circle.web3.developer_controlled_wallets.models.eoa_wallet import EOAWallet
+from circle.web3.developer_controlled_wallets.models.end_user_wallet_set import EndUserWalletSet
 from circle.web3.developer_controlled_wallets.models.error import Error
 from circle.web3.developer_controlled_wallets.models.estimate_contract_execution_transaction_fee_request import EstimateContractExecutionTransactionFeeRequest
+from circle.web3.developer_controlled_wallets.models.estimate_contract_execution_transaction_fee_request_blockchain import EstimateContractExecutionTransactionFeeRequestBlockchain
 from circle.web3.developer_controlled_wallets.models.estimate_transaction_fee_response import EstimateTransactionFeeResponse
 from circle.web3.developer_controlled_wallets.models.estimate_transfer_transaction_fee_request import EstimateTransferTransactionFeeRequest
 from circle.web3.developer_controlled_wallets.models.estimated_transaction_fee import EstimatedTransactionFee
-from circle.web3.developer_controlled_wallets.models.ext_get_all_wallets_response import ExtGetAllWalletsResponse
-from circle.web3.developer_controlled_wallets.models.ext_get_wallet_by_id_response import ExtGetWalletByIDResponse
-from circle.web3.developer_controlled_wallets.models.ext_update_wallet_metadata_request import ExtUpdateWalletMetadataRequest
-from circle.web3.developer_controlled_wallets.models.ext_wallet_response import ExtWalletResponse
-from circle.web3.developer_controlled_wallets.models.ext_wallet_response_wallet import ExtWalletResponseWallet
 from circle.web3.developer_controlled_wallets.models.fee_level import FeeLevel
 from circle.web3.developer_controlled_wallets.models.get_balances_response import GetBalancesResponse
 from circle.web3.developer_controlled_wallets.models.get_nfts_response import GetNftsResponse
@@ -53,35 +49,41 @@ from circle.web3.developer_controlled_wallets.models.get_token_id200_response im
 from circle.web3.developer_controlled_wallets.models.get_transaction200_response import GetTransaction200Response
 from circle.web3.developer_controlled_wallets.models.get_transaction_by_id_response import GetTransactionByIDResponse
 from circle.web3.developer_controlled_wallets.models.get_transactions_response import GetTransactionsResponse
-from circle.web3.developer_controlled_wallets.models.get_wallet200_response import GetWallet200Response
-from circle.web3.developer_controlled_wallets.models.get_wallet_set200_response import GetWalletSet200Response
-from circle.web3.developer_controlled_wallets.models.get_wallet_set_by_id_response import GetWalletSetByIDResponse
-from circle.web3.developer_controlled_wallets.models.get_wallet_sets_response import GetWalletSetsResponse
 from circle.web3.developer_controlled_wallets.models.list_transactions200_response import ListTransactions200Response
 from circle.web3.developer_controlled_wallets.models.list_wallet_ballance200_response import ListWalletBallance200Response
 from circle.web3.developer_controlled_wallets.models.list_wallet_nfts200_response import ListWalletNfts200Response
-from circle.web3.developer_controlled_wallets.models.list_wallet_sets200_response import ListWalletSets200Response
-from circle.web3.developer_controlled_wallets.models.list_wallets200_response import ListWallets200Response
 from circle.web3.developer_controlled_wallets.models.nft import Nft
+from circle.web3.developer_controlled_wallets.models.not_authorized_response import NotAuthorizedResponse
+from circle.web3.developer_controlled_wallets.models.not_found_response import NotFoundResponse
 from circle.web3.developer_controlled_wallets.models.operation import Operation
+from circle.web3.developer_controlled_wallets.models.sca_wallet import SCAWallet
 from circle.web3.developer_controlled_wallets.models.sign_developer_message200_response import SignDeveloperMessage200Response
 from circle.web3.developer_controlled_wallets.models.sign_developer_typed_data200_response import SignDeveloperTypedData200Response
 from circle.web3.developer_controlled_wallets.models.sign_message_for_developer_request import SignMessageForDeveloperRequest
 from circle.web3.developer_controlled_wallets.models.sign_message_for_developer_response import SignMessageForDeveloperResponse
 from circle.web3.developer_controlled_wallets.models.sign_typed_data_for_developer_request import SignTypedDataForDeveloperRequest
 from circle.web3.developer_controlled_wallets.models.sign_typed_data_for_developer_response import SignTypedDataForDeveloperResponse
+from circle.web3.developer_controlled_wallets.models.token_blockchain import TokenBlockchain
 from circle.web3.developer_controlled_wallets.models.token_response import TokenResponse
 from circle.web3.developer_controlled_wallets.models.token_standard import TokenStandard
 from circle.web3.developer_controlled_wallets.models.transaction import Transaction
 from circle.web3.developer_controlled_wallets.models.transaction_state import TransactionState
 from circle.web3.developer_controlled_wallets.models.transaction_type import TransactionType
-from circle.web3.developer_controlled_wallets.models.update_wallet200_response import UpdateWallet200Response
-from circle.web3.developer_controlled_wallets.models.update_wallet_set200_response import UpdateWalletSet200Response
-from circle.web3.developer_controlled_wallets.models.update_wallet_set_metadata_request import UpdateWalletSetMetadataRequest
-from circle.web3.developer_controlled_wallets.models.update_wallet_set_metadata_response import UpdateWalletSetMetadataResponse
+from circle.web3.developer_controlled_wallets.models.update_wallet_request import UpdateWalletRequest
+from circle.web3.developer_controlled_wallets.models.update_wallet_set_request import UpdateWalletSetRequest
 from circle.web3.developer_controlled_wallets.models.validate_address_request import ValidateAddressRequest
 from circle.web3.developer_controlled_wallets.models.validate_address_response import ValidateAddressResponse
+from circle.web3.developer_controlled_wallets.models.wallet import Wallet
+from circle.web3.developer_controlled_wallets.models.wallet2 import Wallet2
+from circle.web3.developer_controlled_wallets.models.wallet2_data import Wallet2Data
 from circle.web3.developer_controlled_wallets.models.wallet_metadata import WalletMetadata
-from circle.web3.developer_controlled_wallets.models.wallet_response import WalletResponse
-from circle.web3.developer_controlled_wallets.models.wallet_set_response import WalletSetResponse
+from circle.web3.developer_controlled_wallets.models.wallet_set import WalletSet
+from circle.web3.developer_controlled_wallets.models.wallet_set2 import WalletSet2
+from circle.web3.developer_controlled_wallets.models.wallet_set2_data import WalletSet2Data
+from circle.web3.developer_controlled_wallets.models.wallet_sets import WalletSets
+from circle.web3.developer_controlled_wallets.models.wallet_sets_data import WalletSetsData
+from circle.web3.developer_controlled_wallets.models.wallet_sets_data_wallet_sets_inner import WalletSetsDataWalletSetsInner
 from circle.web3.developer_controlled_wallets.models.wallet_state import WalletState
+from circle.web3.developer_controlled_wallets.models.wallets import Wallets
+from circle.web3.developer_controlled_wallets.models.wallets_data import WalletsData
+from circle.web3.developer_controlled_wallets.models.wallets_data_wallets_inner import WalletsDataWalletsInner

circle/web3/developer_controlled_wallets/models/accelerate_transaction_for_developer_response.py

@@ -21,7 +21,7 @@ class AccelerateTransactionForDeveloperResponse(BaseModel):
     """
     AccelerateTransactionForDeveloperResponse
     """
-    id: Optional[StrictStr] = Field(None, description="Unique system generated identifier of the resource.")
+    id: Optional[StrictStr] = Field(None, description="System-generated unique identifier of the resource.")
     __properties = ["id"]
 
     def __init__(self, **kwargs):

circle/web3/developer_controlled_wallets/models/account_type.py

@@ -19,7 +19,7 @@ from aenum import Enum, no_arg
 
 class AccountType(str, Enum):
     """
-    An Account can be a Smart Contract Account (SCA) or an Externally Owned Account (EOA). To learn more about account types and the differences between the two, see the [account types guide](https://developers.circle.com/w3s/docs/programmable-wallets-account-types).  If an account type is not specified during the creation of a wallet, it will default to `EOA` (Externally Owned Account). 
+    An account can be a Smart Contract Account (SCA) or an Externally Owned Account (EOA). To learn more, see the [account types guide](https://developers.circle.com/w3s/docs/programmable-wallets-account-types).  If an account type is not specified during the creation of a wallet, it defaults to `EOA` (Externally Owned Account). Note that Solana doesn't support Smart Contract Account (SCA). 
     """
 
     """

circle/web3/developer_controlled_wallets/models/bad_request_response.py

@@ -0,0 +1,85 @@
+# coding: utf-8
+
+"""
+    The version of the OpenAPI document: 1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+
+
+from pydantic import BaseModel, Field, StrictInt, StrictStr
+
+class BadRequestResponse(BaseModel):
+    """
+    BadRequestResponse
+    """
+    code: StrictInt = Field(..., description="Code that corresponds to the error.")
+    message: StrictStr = Field(..., description="Message that describes the error.")
+    __properties = ["code", "message"]
+
+    def __init__(self, **kwargs):
+        if "idempotencyKey" in self.__properties and not kwargs.get("idempotency_key"):
+            kwargs["idempotency_key"] = "#REFILL_PLACEHOLDER"
+
+        if "entitySecretCiphertext" in self.__properties and not kwargs.get("entity_secret_ciphertext"):
+            kwargs["entity_secret_ciphertext"] = "#REFILL_PLACEHOLDER"
+        super().__init__(**kwargs)
+
+
+    class Config:
+        """Pydantic configuration"""
+        allow_population_by_field_name = True
+        validate_assignment = True
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.dict(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> BadRequestResponse:
+        """Create an instance of BadRequestResponse from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self):
+        """Returns the dictionary representation of the model using alias"""
+        _dict = self.dict(by_alias=True,
+                          exclude={
+                          },
+                          exclude_none=True)
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: dict) -> BadRequestResponse:
+        """Create an instance of BadRequestResponse from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return BadRequestResponse.parse_obj(obj)
+
+        # fill idempotency_key and ciphertext with placeholder for auto_fill
+        if "idempotencyKey" in cls.__properties and not obj.get("idempotencyKey"):
+            obj["idempotencyKey"] = "#REFILL_PLACEHOLDER"
+
+        if "entitySecretCiphertext" in cls.__properties and not obj.get("entitySecretCiphertext"):
+            obj["entitySecretCiphertext"] = "#REFILL_PLACEHOLDER"
+
+        _obj = BadRequestResponse.parse_obj({
+            "code": obj.get("code"),
+            "message": obj.get("message")
+        })
+        return _obj
+
+

circle/web3/developer_controlled_wallets/models/balance.py

@@ -24,7 +24,7 @@ class Balance(BaseModel):
     """
     amount: StrictStr = Field(..., description="List of token balances for each token on the wallet(s).")
     token: TokenResponse = Field(...)
-    update_date: datetime = Field(..., alias="updateDate", description="Last update date of the resource. ISO-8601 UTC date/time.")
+    update_date: datetime = Field(..., alias="updateDate", description="Date and time the resource was last updated, in ISO-8601 UTC format.")
     __properties = ["amount", "token", "updateDate"]
 
     def __init__(self, **kwargs):

circle/web3/developer_controlled_wallets/models/blockchain.py

@@ -19,7 +19,7 @@ from aenum import Enum, no_arg
 
 class Blockchain(str, Enum):
     """
-    The blockchain network the resource will be created on or is currently on.
+    The blockchain network that the resource is to be created on or is currently on.
     """
 
     """
@@ -31,6 +31,8 @@ class Blockchain(str, Enum):
     AVAX_MINUS_FUJI = 'AVAX-FUJI'
     MATIC = 'MATIC'
     MATIC_MINUS_AMOY = 'MATIC-AMOY'
+    SOL = 'SOL'
+    SOL_MINUS_DENVET = 'SOL-DENVET'
 
     @classmethod
     def from_json(cls, json_str: str) -> Blockchain:

circle/web3/developer_controlled_wallets/models/cancel_transaction_for_developer_response.py

@@ -22,7 +22,7 @@ class CancelTransactionForDeveloperResponse(BaseModel):
     """
     CancelTransactionForDeveloperResponse
     """
-    id: StrictStr = Field(..., description="Unique system generated identifier of the resource.")
+    id: StrictStr = Field(..., description="System-generated unique identifier of the resource.")
     state: TransactionState = Field(...)
     __properties = ["id", "state"]
 

circle/web3/developer_controlled_wallets/models/create_contract_execution_transaction_for_developer_request.py

@@ -31,10 +31,10 @@ class CreateContractExecutionTransactionForDeveloperRequest(BaseModel):
     contract_address: StrictStr = Field(..., alias="contractAddress", description="The blockchain address of the contract to be executed.")
     entity_secret_ciphertext: Union[StrictBytes, StrictStr] = Field(..., alias="entitySecretCiphertext", description="A base64 string expression of the entity secret ciphertext. The entity secret should be encrypted by the entity public key. Circle mandates that the entity secret ciphertext is unique for each API request. ")
     fee_level: Optional[FeeLevel] = Field(None, alias="feeLevel")
-    gas_limit: Optional[StrictStr] = Field(None, alias="gasLimit", description="The maximum units of gas to use for the transaction. Required if `feeLevel` is not provided. Estimates for this limit can be obtained through the `POST /transactions/transfer/estimateFee` API. ")
-    gas_price: Optional[StrictStr] = Field(None, alias="gasPrice", description="For blockchains without EIP-1559 support, the maximum price of gas, in gwei, to use per each unit of gas (see `gasLimit`). Requires `gasLimit`. Cannot be used with `feeLevel`, `priorityFee`, or `maxFee`. Estimates for this fee can be obtained through the `POST /transactions/transfer/estimateFee` API. ")
-    max_fee: Optional[StrictStr] = Field(None, alias="maxFee", description="For blockchains with EIP-1559 support, the maximum price per unit of gas (see `gasLimit`), in gwei. Requires `priorityFee`, and `gasLimit` to be present. Cannot be used with `feeLevel` or `gasPrice`. Estimates for this fee can be obtained through the `POST /transactions/transfer/estimateFee` API. ")
-    priority_fee: Optional[StrictStr] = Field(None, alias="priorityFee", description="For blockchains with EIP-1559 support, the “tip”, in gwei, to add to the base fee as an incentive for validators. Please note that the `maxFee` and `gasLimit` parameters are required alongside the `priorityFee`. The `feeLevel` and `gasPrice` parameters cannot be used with the `priorityFee`.  Estimations for this fee can be obtained through the `POST /transactions/transfer/estimateFee` API. ")
+    gas_limit: Optional[StrictStr] = Field(None, alias="gasLimit", description="The maximum units of gas to use for the transaction. Required if `feeLevel` is not provided. Note that this field is optional for Solana, which defaults to a gas limit of 200,000 micro-lamport. Estimates for this limit can be obtained through the `POST /transactions/transfer/estimateFee` API. ")
+    gas_price: Optional[StrictStr] = Field(None, alias="gasPrice", description="For blockchains without EIP-1559 support, the maximum price of gas, in gwei, to use per each unit of gas (see `gasLimit`). Requires `gasLimit`. Cannot be used with `feeLevel`, `priorityFee`, or `maxFee`. Note that `gasPrice` is not supported for Solana. Estimates for this fee can be obtained through the `POST /transactions/transfer/estimateFee` API. ")
+    max_fee: Optional[StrictStr] = Field(None, alias="maxFee", description="For blockchains with EIP-1559 support, the maximum price per unit of gas (see `gasLimit`), in gwei. Requires `priorityFee` and `gasLimit` to be present. Cannot be used with `feeLevel` or `gasPrice`. Note that `maxFee` is not supported for Solana.  Estimates for this fee can be obtained through the `POST /transactions/transfer/estimateFee` API. ")
+    priority_fee: Optional[StrictStr] = Field(None, alias="priorityFee", description="For blockchains with EIP-1559 support, the “tip”, in gwei, to add to the base fee as an incentive for validators. For Solana, the gas fee mechanism is similar to EIP-1559, where you can specify the `priority fee` to incentivize miners to include your transaction in a block. Please note that the `maxFee` and `gasLimit` parameters are required alongside the `priorityFee`. The `feeLevel` and `gasPrice` parameters cannot be used with the `priorityFee`.  Estimations for this fee can be obtained through the `POST /transactions/transfer/estimateFee` API. ")
     ref_id: Optional[StrictStr] = Field(None, alias="refId", description="Optional reference or description used to identify the transaction.")
     wallet_id: StrictStr = Field(..., alias="walletId", description="Unique system generated identifier of the wallet. Required when source Address and blockchain is not provided. Mutually exclusive. For contract deploys this wallet ID will be used as the source.")
     __properties = ["idempotencyKey", "abiFunctionSignature", "abiParameters", "callData", "amount", "contractAddress", "entitySecretCiphertext", "feeLevel", "gasLimit", "gasPrice", "maxFee", "priorityFee", "refId", "walletId"]

circle/web3/developer_controlled_wallets/models/create_transfer_transaction_for_developer_request.py

@@ -17,6 +17,7 @@ import json
 from typing import List, Optional, Union
 from pydantic import BaseModel, Field, StrictBytes, StrictStr, conlist
 from circle.web3.developer_controlled_wallets.models.fee_level import FeeLevel
+from circle.web3.developer_controlled_wallets.models.token_blockchain import TokenBlockchain
 
 class CreateTransferTransactionForDeveloperRequest(BaseModel):
     """
@@ -27,15 +28,15 @@ class CreateTransferTransactionForDeveloperRequest(BaseModel):
     destination_address: StrictStr = Field(..., alias="destinationAddress", description="The destination blockchain address for the transaction.")
     entity_secret_ciphertext: Union[StrictBytes, StrictStr] = Field(..., alias="entitySecretCiphertext", description="A base64 string expression of the entity secret ciphertext. The entity secret should be encrypted by the entity public key. Circle mandates that the entity secret ciphertext is unique for each API request. ")
     fee_level: Optional[FeeLevel] = Field(None, alias="feeLevel")
-    gas_limit: Optional[StrictStr] = Field(None, alias="gasLimit", description="The maximum units of gas to use for the transaction. Required if `feeLevel` is not provided. Estimates for this limit can be obtained through the `POST /transactions/transfer/estimateFee` API. ")
-    gas_price: Optional[StrictStr] = Field(None, alias="gasPrice", description="For blockchains without EIP-1559 support, the maximum price of gas, in gwei, to use per each unit of gas (see `gasLimit`). Requires `gasLimit`. Cannot be used with `feeLevel`, `priorityFee`, or `maxFee`. Estimates for this fee can be obtained through the `POST /transactions/transfer/estimateFee` API. ")
-    max_fee: Optional[StrictStr] = Field(None, alias="maxFee", description="For blockchains with EIP-1559 support, the maximum price per unit of gas (see `gasLimit`), in gwei. Requires `priorityFee`, and `gasLimit` to be present. Cannot be used with `feeLevel` or `gasPrice`. Estimates for this fee can be obtained through the `POST /transactions/transfer/estimateFee` API. ")
-    priority_fee: Optional[StrictStr] = Field(None, alias="priorityFee", description="For blockchains with EIP-1559 support, the “tip”, in gwei, to add to the base fee as an incentive for validators. Please note that the `maxFee` and `gasLimit` parameters are required alongside the `priorityFee`. The `feeLevel` and `gasPrice` parameters cannot be used with the `priorityFee`.  Estimations for this fee can be obtained through the `POST /transactions/transfer/estimateFee` API. ")
+    gas_limit: Optional[StrictStr] = Field(None, alias="gasLimit", description="The maximum units of gas to use for the transaction. Required if `feeLevel` is not provided. Note that this field is optional for Solana, which defaults to a gas limit of 200,000 micro-lamport. Estimates for this limit can be obtained through the `POST /transactions/transfer/estimateFee` API. ")
+    gas_price: Optional[StrictStr] = Field(None, alias="gasPrice", description="For blockchains without EIP-1559 support, the maximum price of gas, in gwei, to use per each unit of gas (see `gasLimit`). Requires `gasLimit`. Cannot be used with `feeLevel`, `priorityFee`, or `maxFee`. Note that `gasPrice` is not supported for Solana. Estimates for this fee can be obtained through the `POST /transactions/transfer/estimateFee` API. ")
+    max_fee: Optional[StrictStr] = Field(None, alias="maxFee", description="For blockchains with EIP-1559 support, the maximum price per unit of gas (see `gasLimit`), in gwei. Requires `priorityFee` and `gasLimit` to be present. Cannot be used with `feeLevel` or `gasPrice`. Note that `maxFee` is not supported for Solana.  Estimates for this fee can be obtained through the `POST /transactions/transfer/estimateFee` API. ")
+    priority_fee: Optional[StrictStr] = Field(None, alias="priorityFee", description="For blockchains with EIP-1559 support, the “tip”, in gwei, to add to the base fee as an incentive for validators. For Solana, the gas fee mechanism is similar to EIP-1559, where you can specify the `priority fee` to incentivize miners to include your transaction in a block. Please note that the `maxFee` and `gasLimit` parameters are required alongside the `priorityFee`. The `feeLevel` and `gasPrice` parameters cannot be used with the `priorityFee`.  Estimations for this fee can be obtained through the `POST /transactions/transfer/estimateFee` API. ")
     nft_token_ids: Optional[conlist(StrictStr)] = Field(None, alias="nftTokenIds", description="NftTokenIDs specify the nft ID list to be transferred/batchTransferred for NFT withdrawal. Note. Only erc1155 supports safeBatchTransferFrom.")
     ref_id: Optional[StrictStr] = Field(None, alias="refId", description="Optional reference or description used to identify the transaction.")
     token_id: Optional[StrictStr] = Field(None, alias="tokenId", description="System generated identifier of the token. Excluded with `tokenAddress` and `tokenBlockchain`.")
     token_address: Optional[StrictStr] = Field(None, alias="tokenAddress", description="Blockchain address of the transferred token. Empty for native tokens. Excluded with `tokenId`.")
-    blockchain: Optional[StrictStr] = Field(None, description="Blockchain of the transferred token. Required if tokenId is not provided. Excluded with `tokenId`.")
+    blockchain: Optional[TokenBlockchain] = None
     wallet_id: StrictStr = Field(..., alias="walletId", description="Unique system generated identifier of the wallet. Required when source Address and blockchain is not provided. Mutually exclusive. For contract deploys this wallet ID will be used as the source.")
     __properties = ["idempotencyKey", "amounts", "destinationAddress", "entitySecretCiphertext", "feeLevel", "gasLimit", "gasPrice", "maxFee", "priorityFee", "nftTokenIds", "refId", "tokenId", "tokenAddress", "blockchain", "walletId"]
 

circle/web3/developer_controlled_wallets/models/create_transfer_transaction_for_developer_response.py

@@ -22,7 +22,7 @@ class CreateTransferTransactionForDeveloperResponse(BaseModel):
     """
     CreateTransferTransactionForDeveloperResponse
     """
-    id: StrictStr = Field(..., description="Unique system generated identifier of the resource.")
+    id: StrictStr = Field(..., description="System-generated unique identifier of the resource.")
     state: TransactionState = Field(...)
     __properties = ["id", "state"]
 

circle/web3/developer_controlled_wallets/models/{create_developer_wallet_request.py → create_wallet_request.py}

@@ -20,9 +20,9 @@ from circle.web3.developer_controlled_wallets.models.account_type import Account
 from circle.web3.developer_controlled_wallets.models.blockchain import Blockchain
 from circle.web3.developer_controlled_wallets.models.wallet_metadata import WalletMetadata
 
-class CreateDeveloperWalletRequest(BaseModel):
+class CreateWalletRequest(BaseModel):
     """
-    CreateDeveloperWalletRequest
+    CreateWalletRequest
     """
     idempotency_key: StrictStr = Field(..., alias="idempotencyKey", description="Universally unique identifier (UUID v4) idempotency key. This key is utilized to ensure exactly-once execution of mutating requests. To create a UUIDv4 go to [uuidgenerator.net](https://www.uuidgenerator.net). If the same key is reused, it will be treated as the same request and the original response will be returned.")
     account_type: Optional[AccountType] = Field(None, alias="accountType")
@@ -30,7 +30,7 @@ class CreateDeveloperWalletRequest(BaseModel):
     count: Optional[conint(strict=True, le=200, ge=1)] = Field(None, description="Number of wallets that will be created per specified blockchain.")
     entity_secret_ciphertext: Union[StrictBytes, StrictStr] = Field(..., alias="entitySecretCiphertext", description="A base64 string expression of the entity secret ciphertext. The entity secret should be encrypted by the entity public key. Circle mandates that the entity secret ciphertext is unique for each API request. ")
     metadata: Optional[conlist(WalletMetadata)] = Field(None, description="List of metadata fields to associate with the corresponding wallet. If count is specified, the amount of items in the array should match the count field.")
-    wallet_set_id: StrictStr = Field(..., alias="walletSetId", description="Unique system generated identifier of the wallet's parent wallet set. under.")
+    wallet_set_id: StrictStr = Field(..., alias="walletSetId", description="System-generated unique identifier of the resource.")
     __properties = ["idempotencyKey", "accountType", "blockchains", "count", "entitySecretCiphertext", "metadata", "walletSetId"]
 
     def __init__(self, **kwargs):
@@ -56,8 +56,8 @@ class CreateDeveloperWalletRequest(BaseModel):
         return json.dumps(self.to_dict())
 
     @classmethod
-    def from_json(cls, json_str: str) -> CreateDeveloperWalletRequest:
-        """Create an instance of CreateDeveloperWalletRequest from a JSON string"""
+    def from_json(cls, json_str: str) -> CreateWalletRequest:
+        """Create an instance of CreateWalletRequest from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self):
@@ -76,13 +76,13 @@ class CreateDeveloperWalletRequest(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> CreateDeveloperWalletRequest:
-        """Create an instance of CreateDeveloperWalletRequest from a dict"""
+    def from_dict(cls, obj: dict) -> CreateWalletRequest:
+        """Create an instance of CreateWalletRequest from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return CreateDeveloperWalletRequest.parse_obj(obj)
+            return CreateWalletRequest.parse_obj(obj)
 
         # fill idempotency_key and ciphertext with placeholder for auto_fill
         if "idempotencyKey" in cls.__properties and not obj.get("idempotencyKey"):
@@ -91,7 +91,7 @@ class CreateDeveloperWalletRequest(BaseModel):
         if "entitySecretCiphertext" in cls.__properties and not obj.get("entitySecretCiphertext"):
             obj["entitySecretCiphertext"] = "#REFILL_PLACEHOLDER"
 
-        _obj = CreateDeveloperWalletRequest.parse_obj({
+        _obj = CreateWalletRequest.parse_obj({
             "idempotency_key": obj.get("idempotencyKey"),
             "account_type": obj.get("accountType"),
             "blockchains": obj.get("blockchains"),

circle/web3/developer_controlled_wallets/models/{create_developer_wallet_set_request.py → create_wallet_set_request.py}

@@ -17,14 +17,14 @@ import json
 from typing import Optional, Union
 from pydantic import BaseModel, Field, StrictBytes, StrictStr
 
-class CreateDeveloperWalletSetRequest(BaseModel):
+class CreateWalletSetRequest(BaseModel):
     """
-    CreateDeveloperWalletSetRequest
+    CreateWalletSetRequest
     """
-    idempotency_key: StrictStr = Field(..., alias="idempotencyKey", description="Universally unique identifier (UUID v4) idempotency key. This key is utilized to ensure exactly-once execution of mutating requests. To create a UUIDv4 go to [uuidgenerator.net](https://www.uuidgenerator.net). If the same key is reused, it will be treated as the same request and the original response will be returned.")
     entity_secret_ciphertext: Union[StrictBytes, StrictStr] = Field(..., alias="entitySecretCiphertext", description="A base64 string expression of the entity secret ciphertext. The entity secret should be encrypted by the entity public key. Circle mandates that the entity secret ciphertext is unique for each API request. ")
+    idempotency_key: StrictStr = Field(..., alias="idempotencyKey", description="Universally unique identifier (UUID v4) idempotency key. This key is utilized to ensure exactly-once execution of mutating requests. To create a UUIDv4 go to [uuidgenerator.net](https://www.uuidgenerator.net). If the same key is reused, it will be treated as the same request and the original response will be returned.")
     name: Optional[StrictStr] = None
-    __properties = ["idempotencyKey", "entitySecretCiphertext", "name"]
+    __properties = ["entitySecretCiphertext", "idempotencyKey", "name"]
 
     def __init__(self, **kwargs):
         if "idempotencyKey" in self.__properties and not kwargs.get("idempotency_key"):
@@ -49,8 +49,8 @@ class CreateDeveloperWalletSetRequest(BaseModel):
         return json.dumps(self.to_dict())
 
     @classmethod
-    def from_json(cls, json_str: str) -> CreateDeveloperWalletSetRequest:
-        """Create an instance of CreateDeveloperWalletSetRequest from a JSON string"""
+    def from_json(cls, json_str: str) -> CreateWalletSetRequest:
+        """Create an instance of CreateWalletSetRequest from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self):
@@ -62,13 +62,13 @@ class CreateDeveloperWalletSetRequest(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> CreateDeveloperWalletSetRequest:
-        """Create an instance of CreateDeveloperWalletSetRequest from a dict"""
+    def from_dict(cls, obj: dict) -> CreateWalletSetRequest:
+        """Create an instance of CreateWalletSetRequest from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return CreateDeveloperWalletSetRequest.parse_obj(obj)
+            return CreateWalletSetRequest.parse_obj(obj)
 
         # fill idempotency_key and ciphertext with placeholder for auto_fill
         if "idempotencyKey" in cls.__properties and not obj.get("idempotencyKey"):
@@ -77,9 +77,9 @@ class CreateDeveloperWalletSetRequest(BaseModel):
         if "entitySecretCiphertext" in cls.__properties and not obj.get("entitySecretCiphertext"):
             obj["entitySecretCiphertext"] = "#REFILL_PLACEHOLDER"
 
-        _obj = CreateDeveloperWalletSetRequest.parse_obj({
-            "idempotency_key": obj.get("idempotencyKey"),
+        _obj = CreateWalletSetRequest.parse_obj({
             "entity_secret_ciphertext": obj.get("entitySecretCiphertext"),
+            "idempotency_key": obj.get("idempotencyKey"),
             "name": obj.get("name")
         })
         return _obj

circle/web3/developer_controlled_wallets/models/custody_type.py

@@ -19,7 +19,7 @@ from aenum import Enum, no_arg
 
 class CustodyType(str, Enum):
     """
-    CustodyType
+    Describes who controls the digital assets in a wallet: either the end-user or the developer. 
     """
 
     """

circle/web3/developer_controlled_wallets/models/{update_wallet_set_metadata_response.py → developer_wallet_set.py}

@@ -13,17 +13,19 @@ import pprint
 import re  # noqa: F401
 import json
 
+from datetime import datetime
 
-from typing import Optional
-from pydantic import BaseModel, Field
-from circle.web3.developer_controlled_wallets.models.wallet_set_response import WalletSetResponse
+from pydantic import BaseModel, Field, StrictStr, validator
 
-class UpdateWalletSetMetadataResponse(BaseModel):
+class DeveloperWalletSet(BaseModel):
     """
-    UpdateWalletSetMetadataResponse
+    DeveloperWalletSet
     """
-    wallet_set: Optional[WalletSetResponse] = Field(None, alias="walletSet")
-    __properties = ["walletSet"]
+    id: StrictStr = Field(..., description="System-generated unique identifier of the resource.")
+    create_date: datetime = Field(..., alias="createDate", description="Date and time the resource was created, in ISO-8601 UTC format.")
+    update_date: datetime = Field(..., alias="updateDate", description="Date and time the resource was last updated, in ISO-8601 UTC format.")
+    custody_type: StrictStr = Field(..., alias="custodyType")
+    __properties = ["id", "createDate", "updateDate", "custodyType"]
 
     def __init__(self, **kwargs):
         if "idempotencyKey" in self.__properties and not kwargs.get("idempotency_key"):
@@ -34,6 +36,13 @@ class UpdateWalletSetMetadataResponse(BaseModel):
         super().__init__(**kwargs)
 
 
+    @validator('custody_type')
+    def custody_type_validate_enum(cls, value):
+        """Validates the enum"""
+        if value not in ('DEVELOPER'):
+            raise ValueError("must be one of enum values ('DEVELOPER')")
+        return value
+
     class Config:
         """Pydantic configuration"""
         allow_population_by_field_name = True
@@ -48,8 +57,8 @@ class UpdateWalletSetMetadataResponse(BaseModel):
         return json.dumps(self.to_dict())
 
     @classmethod
-    def from_json(cls, json_str: str) -> UpdateWalletSetMetadataResponse:
-        """Create an instance of UpdateWalletSetMetadataResponse from a JSON string"""
+    def from_json(cls, json_str: str) -> DeveloperWalletSet:
+        """Create an instance of DeveloperWalletSet from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self):
@@ -58,19 +67,16 @@ class UpdateWalletSetMetadataResponse(BaseModel):
                           exclude={
                           },
                           exclude_none=True)
-        # override the default output from pydantic by calling `to_dict()` of wallet_set
-        if self.wallet_set:
-            _dict['walletSet'] = self.wallet_set.to_dict()
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> UpdateWalletSetMetadataResponse:
-        """Create an instance of UpdateWalletSetMetadataResponse from a dict"""
+    def from_dict(cls, obj: dict) -> DeveloperWalletSet:
+        """Create an instance of DeveloperWalletSet from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return UpdateWalletSetMetadataResponse.parse_obj(obj)
+            return DeveloperWalletSet.parse_obj(obj)
 
         # fill idempotency_key and ciphertext with placeholder for auto_fill
         if "idempotencyKey" in cls.__properties and not obj.get("idempotencyKey"):
@@ -79,8 +85,11 @@ class UpdateWalletSetMetadataResponse(BaseModel):
         if "entitySecretCiphertext" in cls.__properties and not obj.get("entitySecretCiphertext"):
             obj["entitySecretCiphertext"] = "#REFILL_PLACEHOLDER"
 
-        _obj = UpdateWalletSetMetadataResponse.parse_obj({
-            "wallet_set": WalletSetResponse.from_dict(obj.get("walletSet")) if obj.get("walletSet") is not None else None
+        _obj = DeveloperWalletSet.parse_obj({
+            "id": obj.get("id"),
+            "create_date": obj.get("createDate"),
+            "update_date": obj.get("updateDate"),
+            "custody_type": obj.get("custodyType")
         })
         return _obj