diff --git a/.github/workflows/create-pr.yml b/.github/workflows/create-pr.yml index 2c0a0625..86ab898a 100644 --- a/.github/workflows/create-pr.yml +++ b/.github/workflows/create-pr.yml @@ -20,6 +20,6 @@ jobs: --body "This PR was automatically generated." \ --base master \ --head ${{ github.ref }} \ - --reviewer asafs932,sharonasw,YoavBZ + --reviewer asafs932,YoavBZ env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index 850c86bd..b881bafe 100644 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -304,8 +304,6 @@ docs/EstimatedNetworkFeeResponse.md docs/EstimatedTransactionFeeResponse.md docs/ExchangeAccount.md docs/ExchangeAccountsApi.md -docs/ExchangeAccountsPaged.md -docs/ExchangeAccountsPagedPaging.md docs/ExchangeAsset.md docs/ExchangeSettlementTransactionsResponse.md docs/ExchangeTradingAccount.md @@ -333,6 +331,7 @@ docs/FeeBreakdownOneOf.md docs/FeeBreakdownOneOf1.md docs/FeeInfo.md docs/FeeLevel.md +docs/FeePayerInfo.md docs/FetchAbiRequestDto.md docs/FiatAccount.md docs/FiatAccountType.md @@ -365,6 +364,8 @@ docs/GetNFTsResponse.md docs/GetOrdersResponse.md docs/GetOtaStatusResponse.md docs/GetOwnershipTokensResponse.md +docs/GetPagedExchangeAccountsResponse.md +docs/GetPagedExchangeAccountsResponsePaging.md docs/GetSigningKeyResponseDto.md docs/GetTransactionOperation.md docs/GetValidationKeyResponseDto.md @@ -1170,8 +1171,6 @@ src/main/java/com/fireblocks/sdk/model/EstimatedFeeDetails.java src/main/java/com/fireblocks/sdk/model/EstimatedNetworkFeeResponse.java src/main/java/com/fireblocks/sdk/model/EstimatedTransactionFeeResponse.java src/main/java/com/fireblocks/sdk/model/ExchangeAccount.java -src/main/java/com/fireblocks/sdk/model/ExchangeAccountsPaged.java -src/main/java/com/fireblocks/sdk/model/ExchangeAccountsPagedPaging.java src/main/java/com/fireblocks/sdk/model/ExchangeAsset.java src/main/java/com/fireblocks/sdk/model/ExchangeSettlementTransactionsResponse.java src/main/java/com/fireblocks/sdk/model/ExchangeTradingAccount.java @@ -1198,6 +1197,7 @@ src/main/java/com/fireblocks/sdk/model/FeeBreakdownOneOf.java src/main/java/com/fireblocks/sdk/model/FeeBreakdownOneOf1.java src/main/java/com/fireblocks/sdk/model/FeeInfo.java src/main/java/com/fireblocks/sdk/model/FeeLevel.java +src/main/java/com/fireblocks/sdk/model/FeePayerInfo.java src/main/java/com/fireblocks/sdk/model/FetchAbiRequestDto.java src/main/java/com/fireblocks/sdk/model/FiatAccount.java src/main/java/com/fireblocks/sdk/model/FiatAccountType.java @@ -1228,6 +1228,8 @@ src/main/java/com/fireblocks/sdk/model/GetNFTsResponse.java src/main/java/com/fireblocks/sdk/model/GetOrdersResponse.java src/main/java/com/fireblocks/sdk/model/GetOtaStatusResponse.java src/main/java/com/fireblocks/sdk/model/GetOwnershipTokensResponse.java +src/main/java/com/fireblocks/sdk/model/GetPagedExchangeAccountsResponse.java +src/main/java/com/fireblocks/sdk/model/GetPagedExchangeAccountsResponsePaging.java src/main/java/com/fireblocks/sdk/model/GetSigningKeyResponseDto.java src/main/java/com/fireblocks/sdk/model/GetTransactionOperation.java src/main/java/com/fireblocks/sdk/model/GetValidationKeyResponseDto.java @@ -1984,8 +1986,6 @@ src/test/java/com/fireblocks/sdk/model/EstimatedFeeDetailsTest.java src/test/java/com/fireblocks/sdk/model/EstimatedNetworkFeeResponseTest.java src/test/java/com/fireblocks/sdk/model/EstimatedTransactionFeeResponseTest.java src/test/java/com/fireblocks/sdk/model/ExchangeAccountTest.java -src/test/java/com/fireblocks/sdk/model/ExchangeAccountsPagedPagingTest.java -src/test/java/com/fireblocks/sdk/model/ExchangeAccountsPagedTest.java src/test/java/com/fireblocks/sdk/model/ExchangeAssetTest.java src/test/java/com/fireblocks/sdk/model/ExchangeSettlementTransactionsResponseTest.java src/test/java/com/fireblocks/sdk/model/ExchangeTradingAccountTest.java @@ -2011,6 +2011,7 @@ src/test/java/com/fireblocks/sdk/model/FeeBreakdownOneOfTest.java src/test/java/com/fireblocks/sdk/model/FeeBreakdownTest.java src/test/java/com/fireblocks/sdk/model/FeeInfoTest.java src/test/java/com/fireblocks/sdk/model/FeeLevelTest.java +src/test/java/com/fireblocks/sdk/model/FeePayerInfoTest.java src/test/java/com/fireblocks/sdk/model/FeeTest.java src/test/java/com/fireblocks/sdk/model/FetchAbiRequestDtoTest.java src/test/java/com/fireblocks/sdk/model/FiatAccountTest.java @@ -2042,6 +2043,8 @@ src/test/java/com/fireblocks/sdk/model/GetNFTsResponseTest.java src/test/java/com/fireblocks/sdk/model/GetOrdersResponseTest.java src/test/java/com/fireblocks/sdk/model/GetOtaStatusResponseTest.java src/test/java/com/fireblocks/sdk/model/GetOwnershipTokensResponseTest.java +src/test/java/com/fireblocks/sdk/model/GetPagedExchangeAccountsResponsePagingTest.java +src/test/java/com/fireblocks/sdk/model/GetPagedExchangeAccountsResponseTest.java src/test/java/com/fireblocks/sdk/model/GetSigningKeyResponseDtoTest.java src/test/java/com/fireblocks/sdk/model/GetTransactionOperationTest.java src/test/java/com/fireblocks/sdk/model/GetValidationKeyResponseDtoTest.java diff --git a/README.md b/README.md index 71927cff..67470a71 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Add this dependency to your project's POM: com.fireblocks.sdk fireblocks-sdk - 12.1.1 + 0.0.0 compile ``` @@ -42,7 +42,7 @@ Add this dependency to your project's POM: Add this dependency to your project's build file: ```groovy -compile "com.fireblocks.sdk:fireblocks-sdk:12.1.1" +compile "com.fireblocks.sdk:fireblocks-sdk:0.0.0" ``` ### Others @@ -55,7 +55,7 @@ mvn clean package Then manually install the following JARs: -- `target/fireblocks-sdk-12.1.1.jar` +- `target/fireblocks-sdk-0.0.0.jar` - `target/lib/*.jar` @@ -743,8 +743,6 @@ Class | Method | HTTP request | Description - [EstimatedNetworkFeeResponse](docs/EstimatedNetworkFeeResponse.md) - [EstimatedTransactionFeeResponse](docs/EstimatedTransactionFeeResponse.md) - [ExchangeAccount](docs/ExchangeAccount.md) - - [ExchangeAccountsPaged](docs/ExchangeAccountsPaged.md) - - [ExchangeAccountsPagedPaging](docs/ExchangeAccountsPagedPaging.md) - [ExchangeAsset](docs/ExchangeAsset.md) - [ExchangeSettlementTransactionsResponse](docs/ExchangeSettlementTransactionsResponse.md) - [ExchangeTradingAccount](docs/ExchangeTradingAccount.md) @@ -771,6 +769,7 @@ Class | Method | HTTP request | Description - [FeeBreakdownOneOf1](docs/FeeBreakdownOneOf1.md) - [FeeInfo](docs/FeeInfo.md) - [FeeLevel](docs/FeeLevel.md) + - [FeePayerInfo](docs/FeePayerInfo.md) - [FetchAbiRequestDto](docs/FetchAbiRequestDto.md) - [FiatAccount](docs/FiatAccount.md) - [FiatAccountType](docs/FiatAccountType.md) @@ -801,6 +800,8 @@ Class | Method | HTTP request | Description - [GetOrdersResponse](docs/GetOrdersResponse.md) - [GetOtaStatusResponse](docs/GetOtaStatusResponse.md) - [GetOwnershipTokensResponse](docs/GetOwnershipTokensResponse.md) + - [GetPagedExchangeAccountsResponse](docs/GetPagedExchangeAccountsResponse.md) + - [GetPagedExchangeAccountsResponsePaging](docs/GetPagedExchangeAccountsResponsePaging.md) - [GetSigningKeyResponseDto](docs/GetSigningKeyResponseDto.md) - [GetTransactionOperation](docs/GetTransactionOperation.md) - [GetValidationKeyResponseDto](docs/GetValidationKeyResponseDto.md) diff --git a/api/openapi.yaml b/api/openapi.yaml index b5a1ac9e..0a4b32bc 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -4160,9 +4160,9 @@ paths: \ = fireblocks.exchangeAccounts.getPagedExchangeAccounts(exchangeAccountsApiGetPagedExchangeAccountsRequest);" name: Fireblocks SDK TypeScript example - language: java - code: "CompletableFuture>> response\ - \ = fireblocks.exchangeAccounts().getPagedExchangeAccounts(limit, before,\ - \ after);" + code: "CompletableFuture>\ + \ response = fireblocks.exchangeAccounts().getPagedExchangeAccounts(limit,\ + \ before, after);" name: Fireblocks SDK Java example - language: python code: "response = fireblocks.exchange_accounts.get_paged_exchange_accounts(limit,\ @@ -4173,9 +4173,9 @@ paths: source: "const response: Promise>\ \ = fireblocks.exchangeAccounts.getPagedExchangeAccounts(exchangeAccountsApiGetPagedExchangeAccountsRequest);" - lang: Java - source: "CompletableFuture>> response\ - \ = fireblocks.exchangeAccounts().getPagedExchangeAccounts(limit, before,\ - \ after);" + source: "CompletableFuture>\ + \ response = fireblocks.exchangeAccounts().getPagedExchangeAccounts(limit,\ + \ before, after);" - lang: Python source: "response = fireblocks.exchange_accounts.get_paged_exchange_accounts(limit,\ \ before, after);" @@ -21690,6 +21690,33 @@ paths: minimum: 1 type: number style: form + - description: Sort by field + explode: true + in: query + name: sortBy + required: false + schema: + default: createdAt + enum: + - createdAt + - updatedAt + - submittedAt + example: createdAt + type: string + style: form + - description: ASC / DESC ordering (default DESC) + explode: true + in: query + name: order + required: false + schema: + default: DESC + enum: + - ASC + - DESC + example: DESC + type: string + style: form responses: "200": content: @@ -21717,12 +21744,12 @@ paths: code: "CompletableFuture>\ \ response = fireblocks.smartTransfer().searchTickets(q, statuses, networkId,\ \ createdByMe, expiresAfter, expiresBefore, type, externalRefId, after,\ - \ limit);" + \ limit, sortBy, order);" name: Fireblocks SDK Java example - language: python code: "response = fireblocks.smart_transfer.search_tickets(q, statuses,\ \ network_id, created_by_me, expires_after, expires_before, type, external_ref_id,\ - \ after, limit);" + \ after, limit, sort_by, order);" name: Fireblocks SDK Python example x-codeSamples: - lang: TypeScript @@ -21732,11 +21759,11 @@ paths: source: "CompletableFuture>\ \ response = fireblocks.smartTransfer().searchTickets(q, statuses, networkId,\ \ createdByMe, expiresAfter, expiresBefore, type, externalRefId, after,\ - \ limit);" + \ limit, sortBy, order);" - lang: Python source: "response = fireblocks.smart_transfer.search_tickets(q, statuses,\ \ network_id, created_by_me, expires_after, expires_before, type, external_ref_id,\ - \ after, limit);" + \ after, limit, sort_by, order);" x-accepts: - application/json post: @@ -26428,10 +26455,10 @@ components: exchangeType: $ref: "#/components/schemas/ExchangeType" type: object - ExchangeAccountsPaged: + GetPagedExchangeAccountsResponse: example: prevUrl: prevUrl - ExchangeAccount: + exchanges: - tradingAccounts: - assets: - providerSymbol: BTC @@ -26587,21 +26614,19 @@ components: after: after nextUrl: nextUrl properties: - ExchangeAccount: + exchanges: items: $ref: "#/components/schemas/ExchangeAccount" type: array paging: - $ref: "#/components/schemas/ExchangeAccountsPaged_paging" + $ref: "#/components/schemas/GetPagedExchangeAccountsResponse_paging" prevUrl: type: string nextUrl: type: string + required: + - exchanges type: object - GetPagedExchangeAccountsResponse: - items: - $ref: "#/components/schemas/ExchangeAccountsPaged" - type: array TradingAccountType: enum: - COIN_FUTURES @@ -28072,8 +28097,8 @@ components: ExternalWalletAsset: example: address: address - lockedAmount: lockedAmount - balance: balance + lockedAmount: 6.027456183070403 + balance: 0.8008281904610115 additionalInfo: - accountHolderCity: accountHolderCity ibanCity: ibanCity @@ -28119,9 +28144,9 @@ components: address: type: string balance: - type: string + type: number lockedAmount: - type: string + type: number tag: type: string activationTime: @@ -29741,6 +29766,7 @@ components: - END_USER_WALLET - PROGRAM_CALL - MULTI_DESTINATION + - OEC_PARTNER type: string SourceTransferPeerPathResponse: description: Source of the transaction. @@ -29899,7 +29925,6 @@ components: users: key: PENDING_AUTHORIZATION logic: AND - destinationAddress: "" amlScreeningResult: provider: provider payload: "{}" @@ -29910,12 +29935,7 @@ components: subType: subType id: id type: null - destinationAddressDescription: "" properties: - destinationAddress: - description: Address where the asset was transferred. - destinationAddressDescription: - description: Description of the address. amount: description: The amount to be sent to this destination. type: string @@ -29959,7 +29979,9 @@ components: relayType: LOCAL relayId: "1" networkFee: networkFee + L2networkFee: "0.0005" relayName: Tenant Name + L1networkFee: "0.003955" feeUSD: "0.0013" gasPrice: gasPrice paidByRelay: true @@ -29973,6 +29995,14 @@ components: type: string gasPrice: type: string + L1networkFee: + description: Layer 1 network fee for Layer 2 blockchain transactions + example: "0.003955" + type: string + L2networkFee: + description: Layer 2 network fee (gas price component for Layer 2 transactions) + example: "0.0005" + type: string paidByRelay: description: Wether the fee was paid by the relay or not example: true @@ -30015,9 +30045,12 @@ components: example: amountUSD: amountUSD destinationAddress: destinationAddress - sourceAddress: sourceAddress netAmount: netAmount + rewardInfo: + destRewards: destRewards + srcRewards: srcRewards networkFee: networkFee + assetId: assetId destination: walletId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 tradingAccount: tradingAccount @@ -30025,7 +30058,6 @@ components: subType: subType id: id type: null - index: 6.027456183070403 source: walletId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 tradingAccount: tradingAccount @@ -30034,12 +30066,8 @@ components: id: id type: VAULT_ACCOUNT type: type - isDropped: true - rewardInfo: - destRewards: destRewards - srcRewards: srcRewards - assetId: assetId txHash: txHash + isDropped: true properties: source: $ref: "#/components/schemas/SourceTransferPeerPathResponse" @@ -30061,24 +30089,27 @@ components: type: string destinationAddress: type: string - sourceAddress: - type: string amountUSD: type: string - index: - type: number rewardInfo: $ref: "#/components/schemas/RewardInfo" type: object ComplianceScreeningResult: example: - provider: provider + provider: CHAINALYSIS payload: "{}" - bypassReason: bypassReason + bypassReason: MANUAL screeningStatus: COMPLETED - timestamp: 5.637376656633329 + timestamp: 5.962133916683182 properties: provider: + description: Screening provider + enum: + - CHAINALYSIS + - ELLIPTIC + - CHAINALYSIS_V2 + - ELLIPTIC_HOLISTIC + - NONE type: string payload: description: | @@ -30087,6 +30118,18 @@ components: The payload is different for each screening provider. type: object bypassReason: + description: Reason AML screening was bypassed + enum: + - MANUAL + - UNSUPPORTED_ASSET + - BYPASSED_FAILURE + - UNSUPPORTED_ROUTE + - PASSED_BY_POLICY + - TIMED_OUT + - BAD_CREDENTIALS + - CONFIGURATION_ERROR + - DROPPED_BY_BLOCKCHAIN + - PROCESS_DISMISSED type: string screeningStatus: enum: @@ -30131,7 +30174,7 @@ components: example: provider: provider success: true - timestamp: 2.3021358869347655 + timestamp: 5.637376656633329 properties: provider: type: string @@ -30144,32 +30187,32 @@ components: description: The result of the Compliance AML/Travel Rule screening. example: aml: - provider: provider + provider: CHAINALYSIS payload: "{}" - bypassReason: bypassReason + bypassReason: MANUAL screeningStatus: COMPLETED - timestamp: 5.637376656633329 + timestamp: 5.962133916683182 amlRegistration: provider: provider success: true - timestamp: 2.3021358869347655 + timestamp: 5.637376656633329 amlList: - - provider: provider + - provider: CHAINALYSIS payload: "{}" - bypassReason: bypassReason + bypassReason: MANUAL screeningStatus: COMPLETED - timestamp: 5.637376656633329 - - provider: provider + timestamp: 5.962133916683182 + - provider: CHAINALYSIS payload: "{}" - bypassReason: bypassReason + bypassReason: MANUAL screeningStatus: COMPLETED - timestamp: 5.637376656633329 + timestamp: 5.962133916683182 tr: - provider: provider + provider: CHAINALYSIS payload: "{}" - bypassReason: bypassReason + bypassReason: MANUAL screeningStatus: COMPLETED - timestamp: 5.637376656633329 + timestamp: 5.962133916683182 status: Started properties: aml: @@ -30202,13 +30245,13 @@ components: description: A list of signed messages returned for raw signing. example: derivationPath: - - 7.061401241503109 - - 7.061401241503109 + - 2.3021358869347655 + - 2.3021358869347655 signature: r: r s: s fullSig: fullSig - v: 9.301444243932576 + v: 7.061401241503109 publicKey: publicKey content: content algorithm: MPC_ECDSA_SECP256K1 @@ -30247,6 +30290,15 @@ components: nullable: true type: string type: object + FeePayerInfo: + example: + feePayerAccountId: "123" + properties: + feePayerAccountId: + description: The account ID of the fee payer + example: "123" + type: string + type: object SystemMessageInfo: example: type: WARN @@ -30267,7 +30319,6 @@ components: type: object TransactionResponse: example: - note: note authorizationInfo: allowOperatorAsAuthorizer: true groups: @@ -30278,29 +30329,14 @@ components: users: key: PENDING_AUTHORIZATION logic: AND - amountUSD: 1.0246457001441578 + amountUSD: 1.2315135367772556 destinationAddress: destinationAddress - contractCallDecodedData: - functionCalls: - - "{}" - - "{}" - contractName: contractName - errorDescription: errorDescription signedBy: - signedBy - signedBy - destinationTag: destinationTag - networkFee: 7.457744773683766 - fee: 6.84685269835264 - destination: - walletId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 - tradingAccount: tradingAccount - name: name - subType: subType - id: id - type: null + networkFee: 6.84685269835264 + fee: 1.4894159098541704 feeCurrency: feeCurrency - extraParameters: "{}" source: walletId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 tradingAccount: tradingAccount @@ -30308,84 +30344,29 @@ components: subType: subType id: id type: VAULT_ACCOUNT - externalTxId: externalTxId - networkRecords: - - amountUSD: amountUSD - destinationAddress: destinationAddress - sourceAddress: sourceAddress - netAmount: netAmount - networkFee: networkFee - destination: - walletId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 - tradingAccount: tradingAccount - name: name - subType: subType - id: id - type: null - index: 6.027456183070403 - source: - walletId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 - tradingAccount: tradingAccount - name: name - subType: subType - id: id - type: VAULT_ACCOUNT - type: type - isDropped: true - rewardInfo: - destRewards: destRewards - srcRewards: srcRewards - assetId: assetId - txHash: txHash - - amountUSD: amountUSD - destinationAddress: destinationAddress - sourceAddress: sourceAddress - netAmount: netAmount - networkFee: networkFee - destination: - walletId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 - tradingAccount: tradingAccount - name: name - subType: subType - id: id - type: null - index: 6.027456183070403 - source: - walletId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 - tradingAccount: tradingAccount - name: name - subType: subType - id: id - type: VAULT_ACCOUNT - type: type - isDropped: true - rewardInfo: - destRewards: destRewards - srcRewards: srcRewards - assetId: assetId - txHash: txHash - createdAt: 1.4658129805029452 - lastUpdated: 5.962133916683182 + createdAt: 6.027456183070403 + lastUpdated: 1.4658129805029452 + gasLimit: "21000" feeInfo: serviceFee: serviceFee relayType: LOCAL relayId: "1" networkFee: networkFee + L2networkFee: "0.0005" relayName: Tenant Name + L1networkFee: "0.003955" feeUSD: "0.0013" gasPrice: gasPrice paidByRelay: true - assetId: assetId id: id tag: tag txHash: txHash + notBroadcastByFireblocks: false blockInfo: blockHash: blockHash blockHeight: blockHeight - serviceFee: 1.4894159098541704 - amount: 7.386281948385884 - sourceAddress: sourceAddress - netAmount: 1.2315135367772556 + serviceFee: 1.0246457001441578 + dappUrl: https://app.uniswap.org addressType: "" destinations: - amount: amount @@ -30400,7 +30381,6 @@ components: users: key: PENDING_AUTHORIZATION logic: AND - destinationAddress: "" amlScreeningResult: provider: provider payload: "{}" @@ -30411,7 +30391,6 @@ components: subType: subType id: id type: null - destinationAddressDescription: "" - amount: amount amountUSD: amountUSD authorizationInfo: @@ -30424,7 +30403,6 @@ components: users: key: PENDING_AUTHORIZATION logic: AND - destinationAddress: "" amlScreeningResult: provider: provider payload: "{}" @@ -30435,85 +30413,165 @@ components: subType: subType id: id type: null - destinationAddressDescription: "" signedMessages: - derivationPath: - - 7.061401241503109 - - 7.061401241503109 + - 2.3021358869347655 + - 2.3021358869347655 signature: r: r s: s fullSig: fullSig - v: 9.301444243932576 + v: 7.061401241503109 publicKey: publicKey content: content algorithm: MPC_ECDSA_SECP256K1 - derivationPath: - - 7.061401241503109 - - 7.061401241503109 + - 2.3021358869347655 + - 2.3021358869347655 signature: r: r s: s fullSig: fullSig - v: 9.301444243932576 + v: 7.061401241503109 publicKey: publicKey content: content algorithm: MPC_ECDSA_SECP256K1 - index: 2.027123023002322 + index: 3.616076749251911 amountInfo: amount: amount amountUSD: amountUSD netAmount: netAmount requestedAmount: requestedAmount customerRefId: customerRefId + nonce: "11228" subStatus: subStatus + assetType: ERC20 treatAsGrossAmount: true + paidRent: "0.00203928" + rejectedBy: rejectedBy + numOfConfirmations: 9.301444243932576 + exchangeTxId: exchangeTxId + rewardInfo: + destRewards: destRewards + srcRewards: srcRewards + amlScreeningResult: + provider: provider + payload: "{}" + requestedAmount: 2.027123023002322 + status: status + note: note + blockchainInfo: + evmTransferType: NATIVE + contractCallDecodedData: + functionCalls: + - "{}" + - "{}" + contractName: contractName + errorDescription: errorDescription + destinationTag: destinationTag + destination: + walletId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + tradingAccount: tradingAccount + name: name + subType: subType + id: id + type: null + extraParameters: "{}" + replacedTxHash: replacedTxHash + externalTxId: externalTxId + networkRecords: + - amountUSD: amountUSD + destinationAddress: destinationAddress + netAmount: netAmount + rewardInfo: + destRewards: destRewards + srcRewards: srcRewards + networkFee: networkFee + assetId: assetId + destination: + walletId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + tradingAccount: tradingAccount + name: name + subType: subType + id: id + type: null + source: + walletId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + tradingAccount: tradingAccount + name: name + subType: subType + id: id + type: VAULT_ACCOUNT + type: type + txHash: txHash + isDropped: true + - amountUSD: amountUSD + destinationAddress: destinationAddress + netAmount: netAmount + rewardInfo: + destRewards: destRewards + srcRewards: srcRewards + networkFee: networkFee + assetId: assetId + destination: + walletId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + tradingAccount: tradingAccount + name: name + subType: subType + id: id + type: null + source: + walletId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + tradingAccount: tradingAccount + name: name + subType: subType + id: id + type: VAULT_ACCOUNT + type: type + txHash: txHash + isDropped: true + blockchainIndex: 1.1.1 + assetId: assetId + amount: 4.145608029883936 + sourceAddress: sourceAddress + netAmount: 7.386281948385884 systemMessages: type: WARN message: Slow transaction processing. Outgoing transactions might be stuck. - rejectedBy: rejectedBy - numOfConfirmations: 3.616076749251911 complianceResults: aml: - provider: provider + provider: CHAINALYSIS payload: "{}" - bypassReason: bypassReason + bypassReason: MANUAL screeningStatus: COMPLETED - timestamp: 5.637376656633329 + timestamp: 5.962133916683182 amlRegistration: provider: provider success: true - timestamp: 2.3021358869347655 + timestamp: 5.637376656633329 amlList: - - provider: provider + - provider: CHAINALYSIS payload: "{}" - bypassReason: bypassReason + bypassReason: MANUAL screeningStatus: COMPLETED - timestamp: 5.637376656633329 - - provider: provider + timestamp: 5.962133916683182 + - provider: CHAINALYSIS payload: "{}" - bypassReason: bypassReason + bypassReason: MANUAL screeningStatus: COMPLETED - timestamp: 5.637376656633329 + timestamp: 5.962133916683182 tr: - provider: provider + provider: CHAINALYSIS payload: "{}" - bypassReason: bypassReason + bypassReason: MANUAL screeningStatus: COMPLETED - timestamp: 5.637376656633329 + timestamp: 5.962133916683182 status: Started createdBy: createdBy - exchangeTxId: exchangeTxId - rewardInfo: - destRewards: destRewards - srcRewards: srcRewards - amlScreeningResult: - provider: provider - payload: "{}" + feePayerInfo: + feePayerAccountId: "123" destinationAddressDescription: destinationAddressDescription - requestedAmount: 4.145608029883936 operation: TRANSFER - status: status properties: id: description: ID of the transaction. @@ -30561,6 +30619,10 @@ components: \ list of supported assets and their IDs on Fireblocks.](https://developers.fireblocks.com/reference/get_supported-assets)" type: string x-fb-entity: asset + assetType: + description: Type classification of the asset + example: ERC20 + type: string source: $ref: "#/components/schemas/SourceTransferPeerPathResponse" sourceAddress: @@ -30651,6 +30713,26 @@ components: $ref: "#/components/schemas/AmlScreeningResult" complianceResults: $ref: "#/components/schemas/ComplianceResults" + notBroadcastByFireblocks: + description: Indicates the transaction was not broadcast by Fireblocks + example: false + type: boolean + dappUrl: + description: DApp URL for Web3 transactions + example: https://app.uniswap.org + type: string + gasLimit: + description: Gas limit for EVM-based blockchain transactions + example: "21000" + type: string + blockchainIndex: + description: Blockchain-specific index or identifier for the transaction + example: 1.1.1 + type: string + paidRent: + description: Solana rent payment amount + example: "0.00203928" + type: string extraParameters: description: | Additional protocol / operation specific key-value parameters: @@ -30681,6 +30763,8 @@ components: type: number rewardInfo: $ref: "#/components/schemas/RewardInfo" + feePayerInfo: + $ref: "#/components/schemas/FeePayerInfo" systemMessages: $ref: "#/components/schemas/SystemMessageInfo" addressType: @@ -30730,6 +30814,19 @@ components: description: The transaction's revert reason. This field will be returned when `subStatus` = 'SMART_CONTRACT_EXECUTION_FAILED'. type: string + replacedTxHash: + description: "if the transaction is a replace by fee (RBF) transaction,\ + \ this is the hash of the transsaction that was replaced" + type: string + nonce: + description: blockchain nonce for the transaction + example: "11228" + type: string + blockchainInfo: + description: A JSON used to store additional data that is blockchain-specific. + example: + evmTransferType: NATIVE + type: object type: object GetTransactionsResponse: items: @@ -57417,7 +57514,7 @@ components: - backedUp - confirmed type: object - ExchangeAccountsPaged_paging: + GetPagedExchangeAccountsResponse_paging: example: before: before after: after @@ -57488,7 +57585,7 @@ components: r: r s: s fullSig: fullSig - v: 9.301444243932576 + v: 7.061401241503109 properties: fullSig: type: string diff --git a/build.gradle b/build.gradle index e889576f..62baedca 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'eclipse' apply plugin: 'com.diffplug.spotless' group = 'com.fireblocks.sdk' -version = '12.1.1' +version = '0.0.0' buildscript { repositories { diff --git a/docs/ComplianceScreeningResult.md b/docs/ComplianceScreeningResult.md index 41d23cdb..361f39ea 100644 --- a/docs/ComplianceScreeningResult.md +++ b/docs/ComplianceScreeningResult.md @@ -7,14 +7,43 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**provider** | **String** | | [optional] | +|**provider** | [**ProviderEnum**](#ProviderEnum) | Screening provider | [optional] | |**payload** | **Object** | The payload of the screening result. The payload is a JSON object that contains the screening result. The payload is different for each screening provider. | [optional] | -|**bypassReason** | **String** | | [optional] | +|**bypassReason** | [**BypassReasonEnum**](#BypassReasonEnum) | Reason AML screening was bypassed | [optional] | |**screeningStatus** | [**ScreeningStatusEnum**](#ScreeningStatusEnum) | | [optional] | |**timestamp** | **BigDecimal** | | [optional] | +## Enum: ProviderEnum + +| Name | Value | +|---- | -----| +| CHAINALYSIS | "CHAINALYSIS" | +| ELLIPTIC | "ELLIPTIC" | +| CHAINALYSIS_V2 | "CHAINALYSIS_V2" | +| ELLIPTIC_HOLISTIC | "ELLIPTIC_HOLISTIC" | +| NONE | "NONE" | + + + +## Enum: BypassReasonEnum + +| Name | Value | +|---- | -----| +| MANUAL | "MANUAL" | +| UNSUPPORTED_ASSET | "UNSUPPORTED_ASSET" | +| BYPASSED_FAILURE | "BYPASSED_FAILURE" | +| UNSUPPORTED_ROUTE | "UNSUPPORTED_ROUTE" | +| PASSED_BY_POLICY | "PASSED_BY_POLICY" | +| TIMED_OUT | "TIMED_OUT" | +| BAD_CREDENTIALS | "BAD_CREDENTIALS" | +| CONFIGURATION_ERROR | "CONFIGURATION_ERROR" | +| DROPPED_BY_BLOCKCHAIN | "DROPPED_BY_BLOCKCHAIN" | +| PROCESS_DISMISSED | "PROCESS_DISMISSED" | + + + ## Enum: ScreeningStatusEnum | Name | Value | diff --git a/docs/ExchangeAccountsApi.md b/docs/ExchangeAccountsApi.md index 0c91bad7..2cc3aba8 100644 --- a/docs/ExchangeAccountsApi.md +++ b/docs/ExchangeAccountsApi.md @@ -435,7 +435,7 @@ No authorization required ## getPagedExchangeAccounts -> CompletableFuture>> getPagedExchangeAccounts getPagedExchangeAccounts(limit, before, after) +> CompletableFuture> getPagedExchangeAccounts getPagedExchangeAccounts(limit, before, after) Pagination list exchange accounts @@ -468,7 +468,7 @@ public class Example { String before = "before_example"; // String | String after = "after_example"; // String | try { - CompletableFuture>> response = fireblocks.exchangeAccounts().getPagedExchangeAccounts(limit, before, after); + CompletableFuture> response = fireblocks.exchangeAccounts().getPagedExchangeAccounts(limit, before, after); System.out.println("Status code: " + response.get().getStatusCode()); System.out.println("Response headers: " + response.get().getHeaders()); System.out.println("Response body: " + response.get().getData()); @@ -501,7 +501,7 @@ public class Example { ### Return type -CompletableFuture> +CompletableFuture> ### Authorization diff --git a/docs/ExchangeAccountsPaged.md b/docs/ExchangeAccountsPaged.md deleted file mode 100644 index 3b9669aa..00000000 --- a/docs/ExchangeAccountsPaged.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# ExchangeAccountsPaged - - -## Properties - -| Name | Type | Description | Notes | -|------------ | ------------- | ------------- | -------------| -|**exchangeAccount** | [**List<ExchangeAccount>**](ExchangeAccount.md) | | [optional] | -|**paging** | [**ExchangeAccountsPagedPaging**](ExchangeAccountsPagedPaging.md) | | [optional] | -|**prevUrl** | **String** | | [optional] | -|**nextUrl** | **String** | | [optional] | - - - diff --git a/docs/ExternalWalletAsset.md b/docs/ExternalWalletAsset.md index 5c84ff27..e17ec8ff 100644 --- a/docs/ExternalWalletAsset.md +++ b/docs/ExternalWalletAsset.md @@ -10,8 +10,8 @@ |**id** | **String** | | [optional] | |**status** | **ConfigChangeRequestStatus** | | [optional] | |**address** | **String** | | [optional] | -|**balance** | **String** | | [optional] | -|**lockedAmount** | **String** | | [optional] | +|**balance** | **BigDecimal** | | [optional] | +|**lockedAmount** | **BigDecimal** | | [optional] | |**tag** | **String** | | [optional] | |**activationTime** | **String** | | [optional] | |**additionalInfo** | [**List<WalletAssetAdditionalInfo>**](WalletAssetAdditionalInfo.md) | | [optional] | diff --git a/docs/FeeInfo.md b/docs/FeeInfo.md index bbbbbf8c..359f69c9 100644 --- a/docs/FeeInfo.md +++ b/docs/FeeInfo.md @@ -11,6 +11,8 @@ Details of the transaction's fee. |**networkFee** | **String** | The fee paid to the network | [optional] | |**serviceFee** | **String** | The total fee deducted by the exchange from the actual requested amount (serviceFee = amount - netAmount) | [optional] | |**gasPrice** | **String** | | [optional] | +|**l1networkFee** | **String** | Layer 1 network fee for Layer 2 blockchain transactions | [optional] | +|**l2networkFee** | **String** | Layer 2 network fee (gas price component for Layer 2 transactions) | [optional] | |**paidByRelay** | **Boolean** | Wether the fee was paid by the relay or not | [optional] | |**relayType** | [**RelayTypeEnum**](#RelayTypeEnum) | Wether the relay is the same tenant (LOCAL) or another tenant (THIRD_PARTY) | [optional] | |**relayId** | **String** | The vault account ID of the relay | [optional] | diff --git a/docs/FeePayerInfo.md b/docs/FeePayerInfo.md new file mode 100644 index 00000000..37e842ce --- /dev/null +++ b/docs/FeePayerInfo.md @@ -0,0 +1,13 @@ + + +# FeePayerInfo + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**feePayerAccountId** | **String** | The account ID of the fee payer | [optional] | + + + diff --git a/docs/GetPagedExchangeAccountsResponse.md b/docs/GetPagedExchangeAccountsResponse.md new file mode 100644 index 00000000..4b66054c --- /dev/null +++ b/docs/GetPagedExchangeAccountsResponse.md @@ -0,0 +1,16 @@ + + +# GetPagedExchangeAccountsResponse + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**exchanges** | [**List<ExchangeAccount>**](ExchangeAccount.md) | | | +|**paging** | [**GetPagedExchangeAccountsResponsePaging**](GetPagedExchangeAccountsResponsePaging.md) | | [optional] | +|**prevUrl** | **String** | | [optional] | +|**nextUrl** | **String** | | [optional] | + + + diff --git a/docs/ExchangeAccountsPagedPaging.md b/docs/GetPagedExchangeAccountsResponsePaging.md similarity index 86% rename from docs/ExchangeAccountsPagedPaging.md rename to docs/GetPagedExchangeAccountsResponsePaging.md index 9dfff902..2434299f 100644 --- a/docs/ExchangeAccountsPagedPaging.md +++ b/docs/GetPagedExchangeAccountsResponsePaging.md @@ -1,6 +1,6 @@ -# ExchangeAccountsPagedPaging +# GetPagedExchangeAccountsResponsePaging ## Properties diff --git a/docs/NetworkRecord.md b/docs/NetworkRecord.md index 1cd93c2e..fd7e3591 100644 --- a/docs/NetworkRecord.md +++ b/docs/NetworkRecord.md @@ -16,9 +16,7 @@ |**isDropped** | **Boolean** | | [optional] | |**type** | **String** | | [optional] | |**destinationAddress** | **String** | | [optional] | -|**sourceAddress** | **String** | | [optional] | |**amountUSD** | **String** | | [optional] | -|**index** | **BigDecimal** | | [optional] | |**rewardInfo** | [**RewardInfo**](RewardInfo.md) | | [optional] | diff --git a/docs/SmartTransferApi.md b/docs/SmartTransferApi.md index eda1f5ff..9ea5edfd 100644 --- a/docs/SmartTransferApi.md +++ b/docs/SmartTransferApi.md @@ -1153,7 +1153,7 @@ No authorization required ## searchTickets -> CompletableFuture> searchTickets searchTickets(q, statuses, networkId, createdByMe, expiresAfter, expiresBefore, type, externalRefId, after, limit) +> CompletableFuture> searchTickets searchTickets(q, statuses, networkId, createdByMe, expiresAfter, expiresBefore, type, externalRefId, after, limit, sortBy, order) Find Ticket @@ -1192,8 +1192,10 @@ public class Example { String externalRefId = "externalRefId_example"; // String | External ref. ID that workspace can use to identify ticket outside of Fireblocks system. String after = "after_example"; // String | ID of the record after which to fetch $limit records BigDecimal limit = new BigDecimal(78); // BigDecimal | Number of records to fetch. By default, it is 100 + String sortBy = "createdAt"; // String | Sort by field + String order = "ASC"; // String | ASC / DESC ordering (default DESC) try { - CompletableFuture> response = fireblocks.smartTransfer().searchTickets(q, statuses, networkId, createdByMe, expiresAfter, expiresBefore, type, externalRefId, after, limit); + CompletableFuture> response = fireblocks.smartTransfer().searchTickets(q, statuses, networkId, createdByMe, expiresAfter, expiresBefore, type, externalRefId, after, limit, sortBy, order); System.out.println("Status code: " + response.get().getStatusCode()); System.out.println("Response headers: " + response.get().getHeaders()); System.out.println("Response body: " + response.get().getData()); @@ -1230,6 +1232,8 @@ public class Example { | **externalRefId** | **String**| External ref. ID that workspace can use to identify ticket outside of Fireblocks system. | [optional] | | **after** | **String**| ID of the record after which to fetch $limit records | [optional] | | **limit** | **BigDecimal**| Number of records to fetch. By default, it is 100 | [optional] | +| **sortBy** | **String**| Sort by field | [optional] [default to createdAt] [enum: createdAt, updatedAt, submittedAt] | +| **order** | **String**| ASC / DESC ordering (default DESC) | [optional] [default to DESC] [enum: ASC, DESC] | ### Return type diff --git a/docs/TransactionResponse.md b/docs/TransactionResponse.md index d3682c69..30cf849c 100644 --- a/docs/TransactionResponse.md +++ b/docs/TransactionResponse.md @@ -15,6 +15,7 @@ |**operation** | **GetTransactionOperation** | | [optional] | |**note** | **String** | Custom note, not sent to the blockchain, that describes the transaction at your Fireblocks workspace. | [optional] | |**assetId** | **String** | The ID of the asset to transfer, for `TRANSFER`, `MINT`, `BURN`, `ENABLE_ASSET`,`STAKE` ,`UNSTAKE` or `WITHDRAW` operations. [See the list of supported assets and their IDs on Fireblocks.](https://developers.fireblocks.com/reference/get_supported-assets) | [optional] | +|**assetType** | **String** | Type classification of the asset | [optional] | |**source** | [**SourceTransferPeerPathResponse**](SourceTransferPeerPathResponse.md) | | [optional] | |**sourceAddress** | **String** | For account based assets only, the source address of the transaction. **Note:** If the status is `CONFIRMING`, `COMPLETED`, or has been `CONFIRMING`; then moved forward to `FAILED` or `REJECTED`, then this parameter will contain the source address. In any other case, this parameter will be empty. | [optional] | |**tag** | **String** | Source address tag for XRP, used as memo for EOS/XLM, or Bank Transfer Description for the fiat provider BLINC (by BCB Group). | [optional] | @@ -39,12 +40,18 @@ |**customerRefId** | **String** | The ID for AML providers to associate the owner of funds with transactions. | [optional] | |**amlScreeningResult** | [**AmlScreeningResult**](AmlScreeningResult.md) | | [optional] | |**complianceResults** | [**ComplianceResults**](ComplianceResults.md) | | [optional] | +|**notBroadcastByFireblocks** | **Boolean** | Indicates the transaction was not broadcast by Fireblocks | [optional] | +|**dappUrl** | **String** | DApp URL for Web3 transactions | [optional] | +|**gasLimit** | **String** | Gas limit for EVM-based blockchain transactions | [optional] | +|**blockchainIndex** | **String** | Blockchain-specific index or identifier for the transaction | [optional] | +|**paidRent** | **String** | Solana rent payment amount | [optional] | |**extraParameters** | **Object** | Additional protocol / operation specific key-value parameters: For UTXO-based blockchain input selection, add the key `inputsSelection` with the value set the [input selection structure.](https://developers.fireblocks.com/reference/transaction-objects#inputsselection) The inputs can be retrieved from the [Retrieve Unspent Inputs endpoint.](https://developers.fireblocks.com/reference/get_vault-accounts-vaultaccountid-assetid-unspent-inputs) For `RAW` operations, add the key `rawMessageData` with the value set to the [raw message data structure.](https://developers.fireblocks.com/reference/raw-signing-objects#rawmessagedata) For `CONTRACT_CALL` operations, add the key `contractCallData` with the value set to the Ethereum smart contract Application Binary Interface (ABI) payload. The Fireblocks [development libraries](https://developers.fireblocks.com/docs/ethereum-development#convenience-libraries) are recommended for building contract call transactions. For **exchange compliance (e.g., Binance) and Travel Rule purposes**, include the key `piiData` containing a **custom JSON structure** with Personally Identifiable Information (PII) relevant to the transaction. This data must be fully **encrypted by the sender** before being submitted to the Fireblocks API. The recommended encryption method is **hybrid encryption** using AES-256-GCM for the payload and RSA-OAEP for key exchange, with the recipient exchange’s public key. [development libraries](https://developers.fireblocks.com/docs/a-developers-guide-to-constructing-encrypted-pii-messages-for-binance-via-fireblocks) | [optional] | |**signedMessages** | [**List<SignedMessage>**](SignedMessage.md) | | [optional] | |**numOfConfirmations** | **BigDecimal** | The number of confirmations of the transaction. The number will increase until the transaction will be considered completed according to the confirmation policy. | [optional] | |**blockInfo** | [**BlockInfo**](BlockInfo.md) | | [optional] | |**index** | **BigDecimal** | For UTXO based assets this is the vOut, for Ethereum based, this is the index of the event of the contract call. **Note:** This field is not returned if a transaction uses the `destinations` object with more than one value. | [optional] | |**rewardInfo** | [**RewardInfo**](RewardInfo.md) | | [optional] | +|**feePayerInfo** | [**FeePayerInfo**](FeePayerInfo.md) | | [optional] | |**systemMessages** | [**SystemMessageInfo**](SystemMessageInfo.md) | | [optional] | |**addressType** | [**AddressTypeEnum**](#AddressTypeEnum) | | [optional] | |**requestedAmount** | **BigDecimal** | The amount requested by the user. Deprecated - please use the `amountInfo` field for accuracy. | [optional] | @@ -55,6 +62,9 @@ |**fee** | **BigDecimal** | Deprecated - please use the `feeInfo` field for accuracy. | [optional] | |**networkFee** | **BigDecimal** | The fee paid to the network. Deprecated - please use the `feeInfo` field for accuracy. | [optional] | |**errorDescription** | **String** | The transaction's revert reason. This field will be returned when `subStatus` = 'SMART_CONTRACT_EXECUTION_FAILED'. | [optional] | +|**replacedTxHash** | **String** | if the transaction is a replace by fee (RBF) transaction, this is the hash of the transsaction that was replaced | [optional] | +|**nonce** | **String** | blockchain nonce for the transaction | [optional] | +|**blockchainInfo** | **Object** | A JSON used to store additional data that is blockchain-specific. | [optional] | diff --git a/docs/TransactionResponseDestination.md b/docs/TransactionResponseDestination.md index 1156bae2..217c9e2f 100644 --- a/docs/TransactionResponseDestination.md +++ b/docs/TransactionResponseDestination.md @@ -7,8 +7,6 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**destinationAddress** | **Object** | Address where the asset was transferred. | [optional] | -|**destinationAddressDescription** | **Object** | Description of the address. | [optional] | |**amount** | **String** | The amount to be sent to this destination. | [optional] | |**amountUSD** | **String** | The USD value of the requested amount. | [optional] | |**amlScreeningResult** | [**AmlScreeningResult**](AmlScreeningResult.md) | | [optional] | diff --git a/docs/TransferPeerPathType.md b/docs/TransferPeerPathType.md index f76ce10d..7d2ec76a 100644 --- a/docs/TransferPeerPathType.md +++ b/docs/TransferPeerPathType.md @@ -33,5 +33,7 @@ * `MULTI_DESTINATION` (value: `"MULTI_DESTINATION"`) +* `OEC_PARTNER` (value: `"OEC_PARTNER"`) + diff --git a/pom.xml b/pom.xml index 183168b0..89176ce6 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ fireblocks-sdk jar fireblocks-sdk - 12.1.1 + 0.0.0 https://github.com/fireblocks/java-sdk The Fireblocks Official SDK is a comprehensive software development kit that enables seamless integration and interaction with the Fireblocks platform. Fireblocks is a cutting-edge blockchain infrastructure platform that provides secure and scalable solutions for managing digital assets and transactions. This SDK empowers developers to build robust applications that can interact with the Fireblocks platform's features, including creating and managing vault accounts, initiating secure transactions, managing assets, and more. It abstracts complex interactions with the Fireblocks API, making it easier for developers to leverage the platform's capabilities while adhering to best practices in security and efficiency. diff --git a/src/main/java/com/fireblocks/sdk/Configuration.java b/src/main/java/com/fireblocks/sdk/Configuration.java index e9944a15..19e09ed9 100644 --- a/src/main/java/com/fireblocks/sdk/Configuration.java +++ b/src/main/java/com/fireblocks/sdk/Configuration.java @@ -21,7 +21,7 @@ value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0") public class Configuration { - public static final String VERSION = "12.1.1"; + public static final String VERSION = "0.0.0"; private static final AtomicReference defaultApiClient = new AtomicReference<>(); private static volatile Supplier apiClientFactory = ApiClient::new; diff --git a/src/main/java/com/fireblocks/sdk/api/ExchangeAccountsApi.java b/src/main/java/com/fireblocks/sdk/api/ExchangeAccountsApi.java index 2929898f..5cc6d2ab 100644 --- a/src/main/java/com/fireblocks/sdk/api/ExchangeAccountsApi.java +++ b/src/main/java/com/fireblocks/sdk/api/ExchangeAccountsApi.java @@ -26,9 +26,9 @@ import com.fireblocks.sdk.model.ConvertAssetsResponse; import com.fireblocks.sdk.model.CreateInternalTransferRequest; import com.fireblocks.sdk.model.ExchangeAccount; -import com.fireblocks.sdk.model.ExchangeAccountsPaged; import com.fireblocks.sdk.model.ExchangeAsset; import com.fireblocks.sdk.model.GetExchangeAccountsCredentialsPublicKeyResponse; +import com.fireblocks.sdk.model.GetPagedExchangeAccountsResponse; import com.fireblocks.sdk.model.InternalTransferResponse; import java.io.IOException; import java.io.InputStream; @@ -480,11 +480,12 @@ private HttpRequest.Builder getExchangeAccountsCredentialsPublicKeyRequestBuilde * @param limit number of exchanges per page (required) * @param before (optional) * @param after (optional) - * @return CompletableFuture<ApiResponse<List<ExchangeAccountsPaged>>> + * @return CompletableFuture<ApiResponse<GetPagedExchangeAccountsResponse>> * @throws ApiException if fails to make API call */ - public CompletableFuture>> getPagedExchangeAccounts( - BigDecimal limit, String before, String after) throws ApiException { + public CompletableFuture> + getPagedExchangeAccounts(BigDecimal limit, String before, String after) + throws ApiException { try { HttpRequest.Builder localVarRequestBuilder = getPagedExchangeAccountsRequestBuilder(limit, before, after); @@ -503,7 +504,7 @@ public CompletableFuture>> getPagedExcha try { String responseBody = localVarResponse.body(); return CompletableFuture.completedFuture( - new ApiResponse>( + new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), responseBody == null || responseBody.isBlank() @@ -511,8 +512,7 @@ public CompletableFuture>> getPagedExcha : memberVarObjectMapper.readValue( responseBody, new TypeReference< - List< - ExchangeAccountsPaged>>() {}))); + GetPagedExchangeAccountsResponse>() {}))); } catch (IOException e) { return CompletableFuture.failedFuture(new ApiException(e)); } diff --git a/src/main/java/com/fireblocks/sdk/api/SmartTransferApi.java b/src/main/java/com/fireblocks/sdk/api/SmartTransferApi.java index db96d41a..5a7ab8ba 100644 --- a/src/main/java/com/fireblocks/sdk/api/SmartTransferApi.java +++ b/src/main/java/com/fireblocks/sdk/api/SmartTransferApi.java @@ -1134,6 +1134,8 @@ private HttpRequest.Builder removeTicketTermRequestBuilder(String ticketId, Stri * Fireblocks system. (optional) * @param after ID of the record after which to fetch $limit records (optional) * @param limit Number of records to fetch. By default, it is 100 (optional) + * @param sortBy Sort by field (optional, default to createdAt) + * @param order ASC / DESC ordering (default DESC) (optional, default to DESC) * @return CompletableFuture<ApiResponse<SmartTransferTicketFilteredResponse>> * @throws ApiException if fails to make API call */ @@ -1147,7 +1149,9 @@ public CompletableFuture> searc String type, String externalRefId, String after, - BigDecimal limit) + BigDecimal limit, + String sortBy, + String order) throws ApiException { try { HttpRequest.Builder localVarRequestBuilder = @@ -1161,7 +1165,9 @@ public CompletableFuture> searc type, externalRefId, after, - limit); + limit, + sortBy, + order); return memberVarHttpClient .sendAsync(localVarRequestBuilder.build(), HttpResponse.BodyHandlers.ofString()) .thenComposeAsync( @@ -1204,7 +1210,9 @@ private HttpRequest.Builder searchTicketsRequestBuilder( String type, String externalRefId, String after, - BigDecimal limit) + BigDecimal limit, + String sortBy, + String order) throws ApiException { HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder(); @@ -1234,6 +1242,10 @@ private HttpRequest.Builder searchTicketsRequestBuilder( localVarQueryParams.addAll(ApiClient.parameterToPairs("after", after)); localVarQueryParameterBaseName = "limit"; localVarQueryParams.addAll(ApiClient.parameterToPairs("limit", limit)); + localVarQueryParameterBaseName = "sortBy"; + localVarQueryParams.addAll(ApiClient.parameterToPairs("sortBy", sortBy)); + localVarQueryParameterBaseName = "order"; + localVarQueryParams.addAll(ApiClient.parameterToPairs("order", order)); if (!localVarQueryParams.isEmpty() || localVarQueryStringJoiner.length() != 0) { StringJoiner queryJoiner = new StringJoiner("&"); diff --git a/src/main/java/com/fireblocks/sdk/model/ComplianceScreeningResult.java b/src/main/java/com/fireblocks/sdk/model/ComplianceScreeningResult.java index a9ba2fa5..faf33512 100644 --- a/src/main/java/com/fireblocks/sdk/model/ComplianceScreeningResult.java +++ b/src/main/java/com/fireblocks/sdk/model/ComplianceScreeningResult.java @@ -35,14 +35,102 @@ value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0") public class ComplianceScreeningResult { + /** Screening provider */ + public enum ProviderEnum { + CHAINALYSIS(String.valueOf("CHAINALYSIS")), + + ELLIPTIC(String.valueOf("ELLIPTIC")), + + CHAINALYSIS_V2(String.valueOf("CHAINALYSIS_V2")), + + ELLIPTIC_HOLISTIC(String.valueOf("ELLIPTIC_HOLISTIC")), + + NONE(String.valueOf("NONE")); + + private String value; + + ProviderEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static ProviderEnum fromValue(String value) { + for (ProviderEnum b : ProviderEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + public static final String JSON_PROPERTY_PROVIDER = "provider"; - @jakarta.annotation.Nullable private String provider; + @jakarta.annotation.Nullable private ProviderEnum provider; public static final String JSON_PROPERTY_PAYLOAD = "payload"; @jakarta.annotation.Nullable private Object payload; + /** Reason AML screening was bypassed */ + public enum BypassReasonEnum { + MANUAL(String.valueOf("MANUAL")), + + UNSUPPORTED_ASSET(String.valueOf("UNSUPPORTED_ASSET")), + + BYPASSED_FAILURE(String.valueOf("BYPASSED_FAILURE")), + + UNSUPPORTED_ROUTE(String.valueOf("UNSUPPORTED_ROUTE")), + + PASSED_BY_POLICY(String.valueOf("PASSED_BY_POLICY")), + + TIMED_OUT(String.valueOf("TIMED_OUT")), + + BAD_CREDENTIALS(String.valueOf("BAD_CREDENTIALS")), + + CONFIGURATION_ERROR(String.valueOf("CONFIGURATION_ERROR")), + + DROPPED_BY_BLOCKCHAIN(String.valueOf("DROPPED_BY_BLOCKCHAIN")), + + PROCESS_DISMISSED(String.valueOf("PROCESS_DISMISSED")); + + private String value; + + BypassReasonEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static BypassReasonEnum fromValue(String value) { + for (BypassReasonEnum b : BypassReasonEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + public static final String JSON_PROPERTY_BYPASS_REASON = "bypassReason"; - @jakarta.annotation.Nullable private String bypassReason; + @jakarta.annotation.Nullable private BypassReasonEnum bypassReason; /** Gets or Sets screeningStatus */ public enum ScreeningStatusEnum { @@ -91,26 +179,26 @@ public static ScreeningStatusEnum fromValue(String value) { public ComplianceScreeningResult() {} - public ComplianceScreeningResult provider(@jakarta.annotation.Nullable String provider) { + public ComplianceScreeningResult provider(@jakarta.annotation.Nullable ProviderEnum provider) { this.provider = provider; return this; } /** - * Get provider + * Screening provider * * @return provider */ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_PROVIDER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getProvider() { + public ProviderEnum getProvider() { return provider; } @JsonProperty(JSON_PROPERTY_PROVIDER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setProvider(@jakarta.annotation.Nullable String provider) { + public void setProvider(@jakarta.annotation.Nullable ProviderEnum provider) { this.provider = provider; } @@ -139,26 +227,26 @@ public void setPayload(@jakarta.annotation.Nullable Object payload) { } public ComplianceScreeningResult bypassReason( - @jakarta.annotation.Nullable String bypassReason) { + @jakarta.annotation.Nullable BypassReasonEnum bypassReason) { this.bypassReason = bypassReason; return this; } /** - * Get bypassReason + * Reason AML screening was bypassed * * @return bypassReason */ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_BYPASS_REASON) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getBypassReason() { + public BypassReasonEnum getBypassReason() { return bypassReason; } @JsonProperty(JSON_PROPERTY_BYPASS_REASON) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setBypassReason(@jakarta.annotation.Nullable String bypassReason) { + public void setBypassReason(@jakarta.annotation.Nullable BypassReasonEnum bypassReason) { this.bypassReason = bypassReason; } diff --git a/src/main/java/com/fireblocks/sdk/model/ExternalWalletAsset.java b/src/main/java/com/fireblocks/sdk/model/ExternalWalletAsset.java index a6103e31..e9fa2d35 100644 --- a/src/main/java/com/fireblocks/sdk/model/ExternalWalletAsset.java +++ b/src/main/java/com/fireblocks/sdk/model/ExternalWalletAsset.java @@ -17,6 +17,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fireblocks.sdk.ApiClient; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -47,10 +48,10 @@ public class ExternalWalletAsset { @jakarta.annotation.Nullable private String address; public static final String JSON_PROPERTY_BALANCE = "balance"; - @jakarta.annotation.Nullable private String balance; + @jakarta.annotation.Nullable private BigDecimal balance; public static final String JSON_PROPERTY_LOCKED_AMOUNT = "lockedAmount"; - @jakarta.annotation.Nullable private String lockedAmount; + @jakarta.annotation.Nullable private BigDecimal lockedAmount; public static final String JSON_PROPERTY_TAG = "tag"; @jakarta.annotation.Nullable private String tag; @@ -133,7 +134,7 @@ public void setAddress(@jakarta.annotation.Nullable String address) { this.address = address; } - public ExternalWalletAsset balance(@jakarta.annotation.Nullable String balance) { + public ExternalWalletAsset balance(@jakarta.annotation.Nullable BigDecimal balance) { this.balance = balance; return this; } @@ -146,17 +147,17 @@ public ExternalWalletAsset balance(@jakarta.annotation.Nullable String balance) @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_BALANCE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getBalance() { + public BigDecimal getBalance() { return balance; } @JsonProperty(JSON_PROPERTY_BALANCE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setBalance(@jakarta.annotation.Nullable String balance) { + public void setBalance(@jakarta.annotation.Nullable BigDecimal balance) { this.balance = balance; } - public ExternalWalletAsset lockedAmount(@jakarta.annotation.Nullable String lockedAmount) { + public ExternalWalletAsset lockedAmount(@jakarta.annotation.Nullable BigDecimal lockedAmount) { this.lockedAmount = lockedAmount; return this; } @@ -169,13 +170,13 @@ public ExternalWalletAsset lockedAmount(@jakarta.annotation.Nullable String lock @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_LOCKED_AMOUNT) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getLockedAmount() { + public BigDecimal getLockedAmount() { return lockedAmount; } @JsonProperty(JSON_PROPERTY_LOCKED_AMOUNT) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setLockedAmount(@jakarta.annotation.Nullable String lockedAmount) { + public void setLockedAmount(@jakarta.annotation.Nullable BigDecimal lockedAmount) { this.lockedAmount = lockedAmount; } diff --git a/src/main/java/com/fireblocks/sdk/model/FeeInfo.java b/src/main/java/com/fireblocks/sdk/model/FeeInfo.java index d017fd4d..092b2c9e 100644 --- a/src/main/java/com/fireblocks/sdk/model/FeeInfo.java +++ b/src/main/java/com/fireblocks/sdk/model/FeeInfo.java @@ -27,6 +27,8 @@ FeeInfo.JSON_PROPERTY_NETWORK_FEE, FeeInfo.JSON_PROPERTY_SERVICE_FEE, FeeInfo.JSON_PROPERTY_GAS_PRICE, + FeeInfo.JSON_PROPERTY_L1NETWORK_FEE, + FeeInfo.JSON_PROPERTY_L2NETWORK_FEE, FeeInfo.JSON_PROPERTY_PAID_BY_RELAY, FeeInfo.JSON_PROPERTY_RELAY_TYPE, FeeInfo.JSON_PROPERTY_RELAY_ID, @@ -46,6 +48,12 @@ public class FeeInfo { public static final String JSON_PROPERTY_GAS_PRICE = "gasPrice"; @jakarta.annotation.Nullable private String gasPrice; + public static final String JSON_PROPERTY_L1NETWORK_FEE = "L1networkFee"; + @jakarta.annotation.Nullable private String l1networkFee; + + public static final String JSON_PROPERTY_L2NETWORK_FEE = "L2networkFee"; + @jakarta.annotation.Nullable private String l2networkFee; + public static final String JSON_PROPERTY_PAID_BY_RELAY = "paidByRelay"; @jakarta.annotation.Nullable private Boolean paidByRelay; @@ -166,6 +174,52 @@ public void setGasPrice(@jakarta.annotation.Nullable String gasPrice) { this.gasPrice = gasPrice; } + public FeeInfo l1networkFee(@jakarta.annotation.Nullable String l1networkFee) { + this.l1networkFee = l1networkFee; + return this; + } + + /** + * Layer 1 network fee for Layer 2 blockchain transactions + * + * @return l1networkFee + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_L1NETWORK_FEE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getL1networkFee() { + return l1networkFee; + } + + @JsonProperty(JSON_PROPERTY_L1NETWORK_FEE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setL1networkFee(@jakarta.annotation.Nullable String l1networkFee) { + this.l1networkFee = l1networkFee; + } + + public FeeInfo l2networkFee(@jakarta.annotation.Nullable String l2networkFee) { + this.l2networkFee = l2networkFee; + return this; + } + + /** + * Layer 2 network fee (gas price component for Layer 2 transactions) + * + * @return l2networkFee + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_L2NETWORK_FEE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getL2networkFee() { + return l2networkFee; + } + + @JsonProperty(JSON_PROPERTY_L2NETWORK_FEE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setL2networkFee(@jakarta.annotation.Nullable String l2networkFee) { + this.l2networkFee = l2networkFee; + } + public FeeInfo paidByRelay(@jakarta.annotation.Nullable Boolean paidByRelay) { this.paidByRelay = paidByRelay; return this; @@ -294,6 +348,8 @@ public boolean equals(Object o) { return Objects.equals(this.networkFee, feeInfo.networkFee) && Objects.equals(this.serviceFee, feeInfo.serviceFee) && Objects.equals(this.gasPrice, feeInfo.gasPrice) + && Objects.equals(this.l1networkFee, feeInfo.l1networkFee) + && Objects.equals(this.l2networkFee, feeInfo.l2networkFee) && Objects.equals(this.paidByRelay, feeInfo.paidByRelay) && Objects.equals(this.relayType, feeInfo.relayType) && Objects.equals(this.relayId, feeInfo.relayId) @@ -307,6 +363,8 @@ public int hashCode() { networkFee, serviceFee, gasPrice, + l1networkFee, + l2networkFee, paidByRelay, relayType, relayId, @@ -321,6 +379,8 @@ public String toString() { sb.append(" networkFee: ").append(toIndentedString(networkFee)).append("\n"); sb.append(" serviceFee: ").append(toIndentedString(serviceFee)).append("\n"); sb.append(" gasPrice: ").append(toIndentedString(gasPrice)).append("\n"); + sb.append(" l1networkFee: ").append(toIndentedString(l1networkFee)).append("\n"); + sb.append(" l2networkFee: ").append(toIndentedString(l2networkFee)).append("\n"); sb.append(" paidByRelay: ").append(toIndentedString(paidByRelay)).append("\n"); sb.append(" relayType: ").append(toIndentedString(relayType)).append("\n"); sb.append(" relayId: ").append(toIndentedString(relayId)).append("\n"); @@ -403,6 +463,26 @@ public String toUrlQueryString(String prefix) { ApiClient.urlEncode(ApiClient.valueToString(getGasPrice())))); } + // add `L1networkFee` to the URL query string + if (getL1networkFee() != null) { + joiner.add( + String.format( + "%sL1networkFee%s=%s", + prefix, + suffix, + ApiClient.urlEncode(ApiClient.valueToString(getL1networkFee())))); + } + + // add `L2networkFee` to the URL query string + if (getL2networkFee() != null) { + joiner.add( + String.format( + "%sL2networkFee%s=%s", + prefix, + suffix, + ApiClient.urlEncode(ApiClient.valueToString(getL2networkFee())))); + } + // add `paidByRelay` to the URL query string if (getPaidByRelay() != null) { joiner.add( diff --git a/src/main/java/com/fireblocks/sdk/model/FeePayerInfo.java b/src/main/java/com/fireblocks/sdk/model/FeePayerInfo.java new file mode 100644 index 00000000..84e55b16 --- /dev/null +++ b/src/main/java/com/fireblocks/sdk/model/FeePayerInfo.java @@ -0,0 +1,141 @@ +/* + * Fireblocks API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 1.6.2 + * Contact: support@fireblocks.com + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package com.fireblocks.sdk.model; + + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fireblocks.sdk.ApiClient; +import java.util.Objects; +import java.util.StringJoiner; + +/** FeePayerInfo */ +@JsonPropertyOrder({FeePayerInfo.JSON_PROPERTY_FEE_PAYER_ACCOUNT_ID}) +@jakarta.annotation.Generated( + value = "org.openapitools.codegen.languages.JavaClientCodegen", + comments = "Generator version: 7.14.0") +public class FeePayerInfo { + public static final String JSON_PROPERTY_FEE_PAYER_ACCOUNT_ID = "feePayerAccountId"; + @jakarta.annotation.Nullable private String feePayerAccountId; + + public FeePayerInfo() {} + + public FeePayerInfo feePayerAccountId(@jakarta.annotation.Nullable String feePayerAccountId) { + this.feePayerAccountId = feePayerAccountId; + return this; + } + + /** + * The account ID of the fee payer + * + * @return feePayerAccountId + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_FEE_PAYER_ACCOUNT_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getFeePayerAccountId() { + return feePayerAccountId; + } + + @JsonProperty(JSON_PROPERTY_FEE_PAYER_ACCOUNT_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setFeePayerAccountId(@jakarta.annotation.Nullable String feePayerAccountId) { + this.feePayerAccountId = feePayerAccountId; + } + + /** Return true if this FeePayerInfo object is equal to o. */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + FeePayerInfo feePayerInfo = (FeePayerInfo) o; + return Objects.equals(this.feePayerAccountId, feePayerInfo.feePayerAccountId); + } + + @Override + public int hashCode() { + return Objects.hash(feePayerAccountId); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class FeePayerInfo {\n"); + sb.append(" feePayerAccountId: ") + .append(toIndentedString(feePayerAccountId)) + .append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces (except the first + * line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + /** + * Convert the instance into URL query string. + * + * @return URL query string + */ + public String toUrlQueryString() { + return toUrlQueryString(null); + } + + /** + * Convert the instance into URL query string. + * + * @param prefix prefix of the query string + * @return URL query string + */ + public String toUrlQueryString(String prefix) { + String suffix = ""; + String containerSuffix = ""; + String containerPrefix = ""; + if (prefix == null) { + // style=form, explode=true, e.g. /pet?name=cat&type=manx + prefix = ""; + } else { + // deepObject style e.g. /pet?id[name]=cat&id[type]=manx + prefix = prefix + "["; + suffix = "]"; + containerSuffix = "]"; + containerPrefix = "["; + } + + StringJoiner joiner = new StringJoiner("&"); + + // add `feePayerAccountId` to the URL query string + if (getFeePayerAccountId() != null) { + joiner.add( + String.format( + "%sfeePayerAccountId%s=%s", + prefix, + suffix, + ApiClient.urlEncode(ApiClient.valueToString(getFeePayerAccountId())))); + } + + return joiner.toString(); + } +} diff --git a/src/main/java/com/fireblocks/sdk/model/ExchangeAccountsPaged.java b/src/main/java/com/fireblocks/sdk/model/GetPagedExchangeAccountsResponse.java similarity index 65% rename from src/main/java/com/fireblocks/sdk/model/ExchangeAccountsPaged.java rename to src/main/java/com/fireblocks/sdk/model/GetPagedExchangeAccountsResponse.java index bf13a539..7f4e6a36 100644 --- a/src/main/java/com/fireblocks/sdk/model/ExchangeAccountsPaged.java +++ b/src/main/java/com/fireblocks/sdk/model/GetPagedExchangeAccountsResponse.java @@ -13,6 +13,7 @@ package com.fireblocks.sdk.model; +import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -22,22 +23,22 @@ import java.util.Objects; import java.util.StringJoiner; -/** ExchangeAccountsPaged */ +/** GetPagedExchangeAccountsResponse */ @JsonPropertyOrder({ - ExchangeAccountsPaged.JSON_PROPERTY_EXCHANGE_ACCOUNT, - ExchangeAccountsPaged.JSON_PROPERTY_PAGING, - ExchangeAccountsPaged.JSON_PROPERTY_PREV_URL, - ExchangeAccountsPaged.JSON_PROPERTY_NEXT_URL + GetPagedExchangeAccountsResponse.JSON_PROPERTY_EXCHANGES, + GetPagedExchangeAccountsResponse.JSON_PROPERTY_PAGING, + GetPagedExchangeAccountsResponse.JSON_PROPERTY_PREV_URL, + GetPagedExchangeAccountsResponse.JSON_PROPERTY_NEXT_URL }) @jakarta.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0") -public class ExchangeAccountsPaged { - public static final String JSON_PROPERTY_EXCHANGE_ACCOUNT = "ExchangeAccount"; - @jakarta.annotation.Nullable private List exchangeAccount; +public class GetPagedExchangeAccountsResponse { + public static final String JSON_PROPERTY_EXCHANGES = "exchanges"; + @jakarta.annotation.Nonnull private List exchanges; public static final String JSON_PROPERTY_PAGING = "paging"; - @jakarta.annotation.Nullable private ExchangeAccountsPagedPaging paging; + @jakarta.annotation.Nullable private GetPagedExchangeAccountsResponsePaging paging; public static final String JSON_PROPERTY_PREV_URL = "prevUrl"; @jakarta.annotation.Nullable private String prevUrl; @@ -45,43 +46,49 @@ public class ExchangeAccountsPaged { public static final String JSON_PROPERTY_NEXT_URL = "nextUrl"; @jakarta.annotation.Nullable private String nextUrl; - public ExchangeAccountsPaged() {} + public GetPagedExchangeAccountsResponse() {} - public ExchangeAccountsPaged exchangeAccount( - @jakarta.annotation.Nullable List exchangeAccount) { - this.exchangeAccount = exchangeAccount; + @JsonCreator + public GetPagedExchangeAccountsResponse( + @JsonProperty(value = JSON_PROPERTY_EXCHANGES, required = true) + List exchanges) { + this.exchanges = exchanges; + } + + public GetPagedExchangeAccountsResponse exchanges( + @jakarta.annotation.Nonnull List exchanges) { + this.exchanges = exchanges; return this; } - public ExchangeAccountsPaged addExchangeAccountItem(ExchangeAccount exchangeAccountItem) { - if (this.exchangeAccount == null) { - this.exchangeAccount = new ArrayList<>(); + public GetPagedExchangeAccountsResponse addExchangesItem(ExchangeAccount exchangesItem) { + if (this.exchanges == null) { + this.exchanges = new ArrayList<>(); } - this.exchangeAccount.add(exchangeAccountItem); + this.exchanges.add(exchangesItem); return this; } /** - * Get exchangeAccount + * Get exchanges * - * @return exchangeAccount + * @return exchanges */ - @jakarta.annotation.Nullable - @JsonProperty(JSON_PROPERTY_EXCHANGE_ACCOUNT) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public List getExchangeAccount() { - return exchangeAccount; + @jakarta.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_EXCHANGES) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public List getExchanges() { + return exchanges; } - @JsonProperty(JSON_PROPERTY_EXCHANGE_ACCOUNT) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setExchangeAccount( - @jakarta.annotation.Nullable List exchangeAccount) { - this.exchangeAccount = exchangeAccount; + @JsonProperty(JSON_PROPERTY_EXCHANGES) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setExchanges(@jakarta.annotation.Nonnull List exchanges) { + this.exchanges = exchanges; } - public ExchangeAccountsPaged paging( - @jakarta.annotation.Nullable ExchangeAccountsPagedPaging paging) { + public GetPagedExchangeAccountsResponse paging( + @jakarta.annotation.Nullable GetPagedExchangeAccountsResponsePaging paging) { this.paging = paging; return this; } @@ -94,17 +101,18 @@ public ExchangeAccountsPaged paging( @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_PAGING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public ExchangeAccountsPagedPaging getPaging() { + public GetPagedExchangeAccountsResponsePaging getPaging() { return paging; } @JsonProperty(JSON_PROPERTY_PAGING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setPaging(@jakarta.annotation.Nullable ExchangeAccountsPagedPaging paging) { + public void setPaging( + @jakarta.annotation.Nullable GetPagedExchangeAccountsResponsePaging paging) { this.paging = paging; } - public ExchangeAccountsPaged prevUrl(@jakarta.annotation.Nullable String prevUrl) { + public GetPagedExchangeAccountsResponse prevUrl(@jakarta.annotation.Nullable String prevUrl) { this.prevUrl = prevUrl; return this; } @@ -127,7 +135,7 @@ public void setPrevUrl(@jakarta.annotation.Nullable String prevUrl) { this.prevUrl = prevUrl; } - public ExchangeAccountsPaged nextUrl(@jakarta.annotation.Nullable String nextUrl) { + public GetPagedExchangeAccountsResponse nextUrl(@jakarta.annotation.Nullable String nextUrl) { this.nextUrl = nextUrl; return this; } @@ -150,7 +158,7 @@ public void setNextUrl(@jakarta.annotation.Nullable String nextUrl) { this.nextUrl = nextUrl; } - /** Return true if this ExchangeAccountsPaged object is equal to o. */ + /** Return true if this GetPagedExchangeAccountsResponse object is equal to o. */ @Override public boolean equals(Object o) { if (this == o) { @@ -159,23 +167,24 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - ExchangeAccountsPaged exchangeAccountsPaged = (ExchangeAccountsPaged) o; - return Objects.equals(this.exchangeAccount, exchangeAccountsPaged.exchangeAccount) - && Objects.equals(this.paging, exchangeAccountsPaged.paging) - && Objects.equals(this.prevUrl, exchangeAccountsPaged.prevUrl) - && Objects.equals(this.nextUrl, exchangeAccountsPaged.nextUrl); + GetPagedExchangeAccountsResponse getPagedExchangeAccountsResponse = + (GetPagedExchangeAccountsResponse) o; + return Objects.equals(this.exchanges, getPagedExchangeAccountsResponse.exchanges) + && Objects.equals(this.paging, getPagedExchangeAccountsResponse.paging) + && Objects.equals(this.prevUrl, getPagedExchangeAccountsResponse.prevUrl) + && Objects.equals(this.nextUrl, getPagedExchangeAccountsResponse.nextUrl); } @Override public int hashCode() { - return Objects.hash(exchangeAccount, paging, prevUrl, nextUrl); + return Objects.hash(exchanges, paging, prevUrl, nextUrl); } @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class ExchangeAccountsPaged {\n"); - sb.append(" exchangeAccount: ").append(toIndentedString(exchangeAccount)).append("\n"); + sb.append("class GetPagedExchangeAccountsResponse {\n"); + sb.append(" exchanges: ").append(toIndentedString(exchanges)).append("\n"); sb.append(" paging: ").append(toIndentedString(paging)).append("\n"); sb.append(" prevUrl: ").append(toIndentedString(prevUrl)).append("\n"); sb.append(" nextUrl: ").append(toIndentedString(nextUrl)).append("\n"); @@ -226,16 +235,16 @@ public String toUrlQueryString(String prefix) { StringJoiner joiner = new StringJoiner("&"); - // add `ExchangeAccount` to the URL query string - if (getExchangeAccount() != null) { - for (int i = 0; i < getExchangeAccount().size(); i++) { - if (getExchangeAccount().get(i) != null) { + // add `exchanges` to the URL query string + if (getExchanges() != null) { + for (int i = 0; i < getExchanges().size(); i++) { + if (getExchanges().get(i) != null) { joiner.add( - getExchangeAccount() + getExchanges() .get(i) .toUrlQueryString( String.format( - "%sExchangeAccount%s%s", + "%sexchanges%s%s", prefix, suffix, "".equals(suffix) diff --git a/src/main/java/com/fireblocks/sdk/model/ExchangeAccountsPagedPaging.java b/src/main/java/com/fireblocks/sdk/model/GetPagedExchangeAccountsResponsePaging.java similarity index 82% rename from src/main/java/com/fireblocks/sdk/model/ExchangeAccountsPagedPaging.java rename to src/main/java/com/fireblocks/sdk/model/GetPagedExchangeAccountsResponsePaging.java index 224991f2..9252b834 100644 --- a/src/main/java/com/fireblocks/sdk/model/ExchangeAccountsPagedPaging.java +++ b/src/main/java/com/fireblocks/sdk/model/GetPagedExchangeAccountsResponsePaging.java @@ -20,24 +20,24 @@ import java.util.Objects; import java.util.StringJoiner; -/** ExchangeAccountsPagedPaging */ +/** GetPagedExchangeAccountsResponsePaging */ @JsonPropertyOrder({ - ExchangeAccountsPagedPaging.JSON_PROPERTY_AFTER, - ExchangeAccountsPagedPaging.JSON_PROPERTY_BEFORE + GetPagedExchangeAccountsResponsePaging.JSON_PROPERTY_AFTER, + GetPagedExchangeAccountsResponsePaging.JSON_PROPERTY_BEFORE }) @jakarta.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0") -public class ExchangeAccountsPagedPaging { +public class GetPagedExchangeAccountsResponsePaging { public static final String JSON_PROPERTY_AFTER = "after"; @jakarta.annotation.Nullable private String after; public static final String JSON_PROPERTY_BEFORE = "before"; @jakarta.annotation.Nullable private String before; - public ExchangeAccountsPagedPaging() {} + public GetPagedExchangeAccountsResponsePaging() {} - public ExchangeAccountsPagedPaging after(@jakarta.annotation.Nullable String after) { + public GetPagedExchangeAccountsResponsePaging after(@jakarta.annotation.Nullable String after) { this.after = after; return this; } @@ -60,7 +60,8 @@ public void setAfter(@jakarta.annotation.Nullable String after) { this.after = after; } - public ExchangeAccountsPagedPaging before(@jakarta.annotation.Nullable String before) { + public GetPagedExchangeAccountsResponsePaging before( + @jakarta.annotation.Nullable String before) { this.before = before; return this; } @@ -83,7 +84,7 @@ public void setBefore(@jakarta.annotation.Nullable String before) { this.before = before; } - /** Return true if this ExchangeAccountsPaged_paging object is equal to o. */ + /** Return true if this GetPagedExchangeAccountsResponse_paging object is equal to o. */ @Override public boolean equals(Object o) { if (this == o) { @@ -92,9 +93,10 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - ExchangeAccountsPagedPaging exchangeAccountsPagedPaging = (ExchangeAccountsPagedPaging) o; - return Objects.equals(this.after, exchangeAccountsPagedPaging.after) - && Objects.equals(this.before, exchangeAccountsPagedPaging.before); + GetPagedExchangeAccountsResponsePaging getPagedExchangeAccountsResponsePaging = + (GetPagedExchangeAccountsResponsePaging) o; + return Objects.equals(this.after, getPagedExchangeAccountsResponsePaging.after) + && Objects.equals(this.before, getPagedExchangeAccountsResponsePaging.before); } @Override @@ -105,7 +107,7 @@ public int hashCode() { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class ExchangeAccountsPagedPaging {\n"); + sb.append("class GetPagedExchangeAccountsResponsePaging {\n"); sb.append(" after: ").append(toIndentedString(after)).append("\n"); sb.append(" before: ").append(toIndentedString(before)).append("\n"); sb.append("}"); diff --git a/src/main/java/com/fireblocks/sdk/model/NetworkRecord.java b/src/main/java/com/fireblocks/sdk/model/NetworkRecord.java index 4cc5c597..159d9282 100644 --- a/src/main/java/com/fireblocks/sdk/model/NetworkRecord.java +++ b/src/main/java/com/fireblocks/sdk/model/NetworkRecord.java @@ -17,7 +17,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fireblocks.sdk.ApiClient; -import java.math.BigDecimal; import java.util.Objects; import java.util.StringJoiner; @@ -32,9 +31,7 @@ NetworkRecord.JSON_PROPERTY_IS_DROPPED, NetworkRecord.JSON_PROPERTY_TYPE, NetworkRecord.JSON_PROPERTY_DESTINATION_ADDRESS, - NetworkRecord.JSON_PROPERTY_SOURCE_ADDRESS, NetworkRecord.JSON_PROPERTY_AMOUNT_U_S_D, - NetworkRecord.JSON_PROPERTY_INDEX, NetworkRecord.JSON_PROPERTY_REWARD_INFO }) @jakarta.annotation.Generated( @@ -68,15 +65,9 @@ public class NetworkRecord { public static final String JSON_PROPERTY_DESTINATION_ADDRESS = "destinationAddress"; @jakarta.annotation.Nullable private String destinationAddress; - public static final String JSON_PROPERTY_SOURCE_ADDRESS = "sourceAddress"; - @jakarta.annotation.Nullable private String sourceAddress; - public static final String JSON_PROPERTY_AMOUNT_U_S_D = "amountUSD"; @jakarta.annotation.Nullable private String amountUSD; - public static final String JSON_PROPERTY_INDEX = "index"; - @jakarta.annotation.Nullable private BigDecimal index; - public static final String JSON_PROPERTY_REWARD_INFO = "rewardInfo"; @jakarta.annotation.Nullable private RewardInfo rewardInfo; @@ -293,29 +284,6 @@ public void setDestinationAddress(@jakarta.annotation.Nullable String destinatio this.destinationAddress = destinationAddress; } - public NetworkRecord sourceAddress(@jakarta.annotation.Nullable String sourceAddress) { - this.sourceAddress = sourceAddress; - return this; - } - - /** - * Get sourceAddress - * - * @return sourceAddress - */ - @jakarta.annotation.Nullable - @JsonProperty(JSON_PROPERTY_SOURCE_ADDRESS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getSourceAddress() { - return sourceAddress; - } - - @JsonProperty(JSON_PROPERTY_SOURCE_ADDRESS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setSourceAddress(@jakarta.annotation.Nullable String sourceAddress) { - this.sourceAddress = sourceAddress; - } - public NetworkRecord amountUSD(@jakarta.annotation.Nullable String amountUSD) { this.amountUSD = amountUSD; return this; @@ -339,29 +307,6 @@ public void setAmountUSD(@jakarta.annotation.Nullable String amountUSD) { this.amountUSD = amountUSD; } - public NetworkRecord index(@jakarta.annotation.Nullable BigDecimal index) { - this.index = index; - return this; - } - - /** - * Get index - * - * @return index - */ - @jakarta.annotation.Nullable - @JsonProperty(JSON_PROPERTY_INDEX) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public BigDecimal getIndex() { - return index; - } - - @JsonProperty(JSON_PROPERTY_INDEX) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setIndex(@jakarta.annotation.Nullable BigDecimal index) { - this.index = index; - } - public NetworkRecord rewardInfo(@jakarta.annotation.Nullable RewardInfo rewardInfo) { this.rewardInfo = rewardInfo; return this; @@ -404,9 +349,7 @@ public boolean equals(Object o) { && Objects.equals(this.isDropped, networkRecord.isDropped) && Objects.equals(this.type, networkRecord.type) && Objects.equals(this.destinationAddress, networkRecord.destinationAddress) - && Objects.equals(this.sourceAddress, networkRecord.sourceAddress) && Objects.equals(this.amountUSD, networkRecord.amountUSD) - && Objects.equals(this.index, networkRecord.index) && Objects.equals(this.rewardInfo, networkRecord.rewardInfo); } @@ -422,9 +365,7 @@ public int hashCode() { isDropped, type, destinationAddress, - sourceAddress, amountUSD, - index, rewardInfo); } @@ -443,9 +384,7 @@ public String toString() { sb.append(" destinationAddress: ") .append(toIndentedString(destinationAddress)) .append("\n"); - sb.append(" sourceAddress: ").append(toIndentedString(sourceAddress)).append("\n"); sb.append(" amountUSD: ").append(toIndentedString(amountUSD)).append("\n"); - sb.append(" index: ").append(toIndentedString(index)).append("\n"); sb.append(" rewardInfo: ").append(toIndentedString(rewardInfo)).append("\n"); sb.append("}"); return sb.toString(); @@ -574,16 +513,6 @@ public String toUrlQueryString(String prefix) { ApiClient.urlEncode(ApiClient.valueToString(getDestinationAddress())))); } - // add `sourceAddress` to the URL query string - if (getSourceAddress() != null) { - joiner.add( - String.format( - "%ssourceAddress%s=%s", - prefix, - suffix, - ApiClient.urlEncode(ApiClient.valueToString(getSourceAddress())))); - } - // add `amountUSD` to the URL query string if (getAmountUSD() != null) { joiner.add( @@ -594,16 +523,6 @@ public String toUrlQueryString(String prefix) { ApiClient.urlEncode(ApiClient.valueToString(getAmountUSD())))); } - // add `index` to the URL query string - if (getIndex() != null) { - joiner.add( - String.format( - "%sindex%s=%s", - prefix, - suffix, - ApiClient.urlEncode(ApiClient.valueToString(getIndex())))); - } - // add `rewardInfo` to the URL query string if (getRewardInfo() != null) { joiner.add(getRewardInfo().toUrlQueryString(prefix + "rewardInfo" + suffix)); diff --git a/src/main/java/com/fireblocks/sdk/model/TransactionResponse.java b/src/main/java/com/fireblocks/sdk/model/TransactionResponse.java index 48eabc24..07bd7ec7 100644 --- a/src/main/java/com/fireblocks/sdk/model/TransactionResponse.java +++ b/src/main/java/com/fireblocks/sdk/model/TransactionResponse.java @@ -35,6 +35,7 @@ TransactionResponse.JSON_PROPERTY_OPERATION, TransactionResponse.JSON_PROPERTY_NOTE, TransactionResponse.JSON_PROPERTY_ASSET_ID, + TransactionResponse.JSON_PROPERTY_ASSET_TYPE, TransactionResponse.JSON_PROPERTY_SOURCE, TransactionResponse.JSON_PROPERTY_SOURCE_ADDRESS, TransactionResponse.JSON_PROPERTY_TAG, @@ -59,12 +60,18 @@ TransactionResponse.JSON_PROPERTY_CUSTOMER_REF_ID, TransactionResponse.JSON_PROPERTY_AML_SCREENING_RESULT, TransactionResponse.JSON_PROPERTY_COMPLIANCE_RESULTS, + TransactionResponse.JSON_PROPERTY_NOT_BROADCAST_BY_FIREBLOCKS, + TransactionResponse.JSON_PROPERTY_DAPP_URL, + TransactionResponse.JSON_PROPERTY_GAS_LIMIT, + TransactionResponse.JSON_PROPERTY_BLOCKCHAIN_INDEX, + TransactionResponse.JSON_PROPERTY_PAID_RENT, TransactionResponse.JSON_PROPERTY_EXTRA_PARAMETERS, TransactionResponse.JSON_PROPERTY_SIGNED_MESSAGES, TransactionResponse.JSON_PROPERTY_NUM_OF_CONFIRMATIONS, TransactionResponse.JSON_PROPERTY_BLOCK_INFO, TransactionResponse.JSON_PROPERTY_INDEX, TransactionResponse.JSON_PROPERTY_REWARD_INFO, + TransactionResponse.JSON_PROPERTY_FEE_PAYER_INFO, TransactionResponse.JSON_PROPERTY_SYSTEM_MESSAGES, TransactionResponse.JSON_PROPERTY_ADDRESS_TYPE, TransactionResponse.JSON_PROPERTY_REQUESTED_AMOUNT, @@ -74,7 +81,10 @@ TransactionResponse.JSON_PROPERTY_SERVICE_FEE, TransactionResponse.JSON_PROPERTY_FEE, TransactionResponse.JSON_PROPERTY_NETWORK_FEE, - TransactionResponse.JSON_PROPERTY_ERROR_DESCRIPTION + TransactionResponse.JSON_PROPERTY_ERROR_DESCRIPTION, + TransactionResponse.JSON_PROPERTY_REPLACED_TX_HASH, + TransactionResponse.JSON_PROPERTY_NONCE, + TransactionResponse.JSON_PROPERTY_BLOCKCHAIN_INFO }) @jakarta.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", @@ -104,6 +114,9 @@ public class TransactionResponse { public static final String JSON_PROPERTY_ASSET_ID = "assetId"; @jakarta.annotation.Nullable private String assetId; + public static final String JSON_PROPERTY_ASSET_TYPE = "assetType"; + @jakarta.annotation.Nullable private String assetType; + public static final String JSON_PROPERTY_SOURCE = "source"; @jakarta.annotation.Nullable private SourceTransferPeerPathResponse source; @@ -179,6 +192,22 @@ public class TransactionResponse { public static final String JSON_PROPERTY_COMPLIANCE_RESULTS = "complianceResults"; @jakarta.annotation.Nullable private ComplianceResults complianceResults; + public static final String JSON_PROPERTY_NOT_BROADCAST_BY_FIREBLOCKS = + "notBroadcastByFireblocks"; + @jakarta.annotation.Nullable private Boolean notBroadcastByFireblocks; + + public static final String JSON_PROPERTY_DAPP_URL = "dappUrl"; + @jakarta.annotation.Nullable private String dappUrl; + + public static final String JSON_PROPERTY_GAS_LIMIT = "gasLimit"; + @jakarta.annotation.Nullable private String gasLimit; + + public static final String JSON_PROPERTY_BLOCKCHAIN_INDEX = "blockchainIndex"; + @jakarta.annotation.Nullable private String blockchainIndex; + + public static final String JSON_PROPERTY_PAID_RENT = "paidRent"; + @jakarta.annotation.Nullable private String paidRent; + public static final String JSON_PROPERTY_EXTRA_PARAMETERS = "extraParameters"; @jakarta.annotation.Nullable private Object extraParameters; @@ -197,6 +226,9 @@ public class TransactionResponse { public static final String JSON_PROPERTY_REWARD_INFO = "rewardInfo"; @jakarta.annotation.Nullable private RewardInfo rewardInfo; + public static final String JSON_PROPERTY_FEE_PAYER_INFO = "feePayerInfo"; + @jakarta.annotation.Nullable private FeePayerInfo feePayerInfo; + public static final String JSON_PROPERTY_SYSTEM_MESSAGES = "systemMessages"; @jakarta.annotation.Nullable private SystemMessageInfo systemMessages; @@ -262,6 +294,15 @@ public static AddressTypeEnum fromValue(String value) { public static final String JSON_PROPERTY_ERROR_DESCRIPTION = "errorDescription"; @jakarta.annotation.Nullable private String errorDescription; + public static final String JSON_PROPERTY_REPLACED_TX_HASH = "replacedTxHash"; + @jakarta.annotation.Nullable private String replacedTxHash; + + public static final String JSON_PROPERTY_NONCE = "nonce"; + @jakarta.annotation.Nullable private String nonce; + + public static final String JSON_PROPERTY_BLOCKCHAIN_INFO = "blockchainInfo"; + @jakarta.annotation.Nullable private Object blockchainInfo; + public TransactionResponse() {} public TransactionResponse id(@jakarta.annotation.Nullable String id) { @@ -470,6 +511,29 @@ public void setAssetId(@jakarta.annotation.Nullable String assetId) { this.assetId = assetId; } + public TransactionResponse assetType(@jakarta.annotation.Nullable String assetType) { + this.assetType = assetType; + return this; + } + + /** + * Type classification of the asset + * + * @return assetType + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ASSET_TYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getAssetType() { + return assetType; + } + + @JsonProperty(JSON_PROPERTY_ASSET_TYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAssetType(@jakarta.annotation.Nullable String assetType) { + this.assetType = assetType; + } + public TransactionResponse source( @jakarta.annotation.Nullable SourceTransferPeerPathResponse source) { this.source = source; @@ -1087,6 +1151,124 @@ public void setComplianceResults( this.complianceResults = complianceResults; } + public TransactionResponse notBroadcastByFireblocks( + @jakarta.annotation.Nullable Boolean notBroadcastByFireblocks) { + this.notBroadcastByFireblocks = notBroadcastByFireblocks; + return this; + } + + /** + * Indicates the transaction was not broadcast by Fireblocks + * + * @return notBroadcastByFireblocks + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NOT_BROADCAST_BY_FIREBLOCKS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Boolean getNotBroadcastByFireblocks() { + return notBroadcastByFireblocks; + } + + @JsonProperty(JSON_PROPERTY_NOT_BROADCAST_BY_FIREBLOCKS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNotBroadcastByFireblocks( + @jakarta.annotation.Nullable Boolean notBroadcastByFireblocks) { + this.notBroadcastByFireblocks = notBroadcastByFireblocks; + } + + public TransactionResponse dappUrl(@jakarta.annotation.Nullable String dappUrl) { + this.dappUrl = dappUrl; + return this; + } + + /** + * DApp URL for Web3 transactions + * + * @return dappUrl + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_DAPP_URL) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getDappUrl() { + return dappUrl; + } + + @JsonProperty(JSON_PROPERTY_DAPP_URL) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDappUrl(@jakarta.annotation.Nullable String dappUrl) { + this.dappUrl = dappUrl; + } + + public TransactionResponse gasLimit(@jakarta.annotation.Nullable String gasLimit) { + this.gasLimit = gasLimit; + return this; + } + + /** + * Gas limit for EVM-based blockchain transactions + * + * @return gasLimit + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_GAS_LIMIT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getGasLimit() { + return gasLimit; + } + + @JsonProperty(JSON_PROPERTY_GAS_LIMIT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setGasLimit(@jakarta.annotation.Nullable String gasLimit) { + this.gasLimit = gasLimit; + } + + public TransactionResponse blockchainIndex( + @jakarta.annotation.Nullable String blockchainIndex) { + this.blockchainIndex = blockchainIndex; + return this; + } + + /** + * Blockchain-specific index or identifier for the transaction + * + * @return blockchainIndex + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_BLOCKCHAIN_INDEX) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getBlockchainIndex() { + return blockchainIndex; + } + + @JsonProperty(JSON_PROPERTY_BLOCKCHAIN_INDEX) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setBlockchainIndex(@jakarta.annotation.Nullable String blockchainIndex) { + this.blockchainIndex = blockchainIndex; + } + + public TransactionResponse paidRent(@jakarta.annotation.Nullable String paidRent) { + this.paidRent = paidRent; + return this; + } + + /** + * Solana rent payment amount + * + * @return paidRent + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_PAID_RENT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getPaidRent() { + return paidRent; + } + + @JsonProperty(JSON_PROPERTY_PAID_RENT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPaidRent(@jakarta.annotation.Nullable String paidRent) { + this.paidRent = paidRent; + } + public TransactionResponse extraParameters( @jakarta.annotation.Nullable Object extraParameters) { this.extraParameters = extraParameters; @@ -1259,6 +1441,30 @@ public void setRewardInfo(@jakarta.annotation.Nullable RewardInfo rewardInfo) { this.rewardInfo = rewardInfo; } + public TransactionResponse feePayerInfo( + @jakarta.annotation.Nullable FeePayerInfo feePayerInfo) { + this.feePayerInfo = feePayerInfo; + return this; + } + + /** + * Get feePayerInfo + * + * @return feePayerInfo + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_FEE_PAYER_INFO) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public FeePayerInfo getFeePayerInfo() { + return feePayerInfo; + } + + @JsonProperty(JSON_PROPERTY_FEE_PAYER_INFO) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setFeePayerInfo(@jakarta.annotation.Nullable FeePayerInfo feePayerInfo) { + this.feePayerInfo = feePayerInfo; + } + public TransactionResponse systemMessages( @jakarta.annotation.Nullable SystemMessageInfo systemMessages) { this.systemMessages = systemMessages; @@ -1516,6 +1722,76 @@ public void setErrorDescription(@jakarta.annotation.Nullable String errorDescrip this.errorDescription = errorDescription; } + public TransactionResponse replacedTxHash(@jakarta.annotation.Nullable String replacedTxHash) { + this.replacedTxHash = replacedTxHash; + return this; + } + + /** + * if the transaction is a replace by fee (RBF) transaction, this is the hash of the + * transsaction that was replaced + * + * @return replacedTxHash + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_REPLACED_TX_HASH) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getReplacedTxHash() { + return replacedTxHash; + } + + @JsonProperty(JSON_PROPERTY_REPLACED_TX_HASH) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setReplacedTxHash(@jakarta.annotation.Nullable String replacedTxHash) { + this.replacedTxHash = replacedTxHash; + } + + public TransactionResponse nonce(@jakarta.annotation.Nullable String nonce) { + this.nonce = nonce; + return this; + } + + /** + * blockchain nonce for the transaction + * + * @return nonce + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NONCE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getNonce() { + return nonce; + } + + @JsonProperty(JSON_PROPERTY_NONCE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNonce(@jakarta.annotation.Nullable String nonce) { + this.nonce = nonce; + } + + public TransactionResponse blockchainInfo(@jakarta.annotation.Nullable Object blockchainInfo) { + this.blockchainInfo = blockchainInfo; + return this; + } + + /** + * A JSON used to store additional data that is blockchain-specific. + * + * @return blockchainInfo + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_BLOCKCHAIN_INFO) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Object getBlockchainInfo() { + return blockchainInfo; + } + + @JsonProperty(JSON_PROPERTY_BLOCKCHAIN_INFO) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setBlockchainInfo(@jakarta.annotation.Nullable Object blockchainInfo) { + this.blockchainInfo = blockchainInfo; + } + /** Return true if this TransactionResponse object is equal to o. */ @Override public boolean equals(Object o) { @@ -1534,6 +1810,7 @@ public boolean equals(Object o) { && Objects.equals(this.operation, transactionResponse.operation) && Objects.equals(this.note, transactionResponse.note) && Objects.equals(this.assetId, transactionResponse.assetId) + && Objects.equals(this.assetType, transactionResponse.assetType) && Objects.equals(this.source, transactionResponse.source) && Objects.equals(this.sourceAddress, transactionResponse.sourceAddress) && Objects.equals(this.tag, transactionResponse.tag) @@ -1561,12 +1838,19 @@ public boolean equals(Object o) { && Objects.equals(this.customerRefId, transactionResponse.customerRefId) && Objects.equals(this.amlScreeningResult, transactionResponse.amlScreeningResult) && Objects.equals(this.complianceResults, transactionResponse.complianceResults) + && Objects.equals( + this.notBroadcastByFireblocks, transactionResponse.notBroadcastByFireblocks) + && Objects.equals(this.dappUrl, transactionResponse.dappUrl) + && Objects.equals(this.gasLimit, transactionResponse.gasLimit) + && Objects.equals(this.blockchainIndex, transactionResponse.blockchainIndex) + && Objects.equals(this.paidRent, transactionResponse.paidRent) && Objects.equals(this.extraParameters, transactionResponse.extraParameters) && Objects.equals(this.signedMessages, transactionResponse.signedMessages) && Objects.equals(this.numOfConfirmations, transactionResponse.numOfConfirmations) && Objects.equals(this.blockInfo, transactionResponse.blockInfo) && Objects.equals(this.index, transactionResponse.index) && Objects.equals(this.rewardInfo, transactionResponse.rewardInfo) + && Objects.equals(this.feePayerInfo, transactionResponse.feePayerInfo) && Objects.equals(this.systemMessages, transactionResponse.systemMessages) && Objects.equals(this.addressType, transactionResponse.addressType) && Objects.equals(this.requestedAmount, transactionResponse.requestedAmount) @@ -1576,7 +1860,10 @@ public boolean equals(Object o) { && Objects.equals(this.serviceFee, transactionResponse.serviceFee) && Objects.equals(this.fee, transactionResponse.fee) && Objects.equals(this.networkFee, transactionResponse.networkFee) - && Objects.equals(this.errorDescription, transactionResponse.errorDescription); + && Objects.equals(this.errorDescription, transactionResponse.errorDescription) + && Objects.equals(this.replacedTxHash, transactionResponse.replacedTxHash) + && Objects.equals(this.nonce, transactionResponse.nonce) + && Objects.equals(this.blockchainInfo, transactionResponse.blockchainInfo); } @Override @@ -1590,6 +1877,7 @@ public int hashCode() { operation, note, assetId, + assetType, source, sourceAddress, tag, @@ -1614,12 +1902,18 @@ public int hashCode() { customerRefId, amlScreeningResult, complianceResults, + notBroadcastByFireblocks, + dappUrl, + gasLimit, + blockchainIndex, + paidRent, extraParameters, signedMessages, numOfConfirmations, blockInfo, index, rewardInfo, + feePayerInfo, systemMessages, addressType, requestedAmount, @@ -1629,7 +1923,10 @@ public int hashCode() { serviceFee, fee, networkFee, - errorDescription); + errorDescription, + replacedTxHash, + nonce, + blockchainInfo); } @Override @@ -1644,6 +1941,7 @@ public String toString() { sb.append(" operation: ").append(toIndentedString(operation)).append("\n"); sb.append(" note: ").append(toIndentedString(note)).append("\n"); sb.append(" assetId: ").append(toIndentedString(assetId)).append("\n"); + sb.append(" assetType: ").append(toIndentedString(assetType)).append("\n"); sb.append(" source: ").append(toIndentedString(source)).append("\n"); sb.append(" sourceAddress: ").append(toIndentedString(sourceAddress)).append("\n"); sb.append(" tag: ").append(toIndentedString(tag)).append("\n"); @@ -1682,6 +1980,13 @@ public String toString() { sb.append(" complianceResults: ") .append(toIndentedString(complianceResults)) .append("\n"); + sb.append(" notBroadcastByFireblocks: ") + .append(toIndentedString(notBroadcastByFireblocks)) + .append("\n"); + sb.append(" dappUrl: ").append(toIndentedString(dappUrl)).append("\n"); + sb.append(" gasLimit: ").append(toIndentedString(gasLimit)).append("\n"); + sb.append(" blockchainIndex: ").append(toIndentedString(blockchainIndex)).append("\n"); + sb.append(" paidRent: ").append(toIndentedString(paidRent)).append("\n"); sb.append(" extraParameters: ").append(toIndentedString(extraParameters)).append("\n"); sb.append(" signedMessages: ").append(toIndentedString(signedMessages)).append("\n"); sb.append(" numOfConfirmations: ") @@ -1690,6 +1995,7 @@ public String toString() { sb.append(" blockInfo: ").append(toIndentedString(blockInfo)).append("\n"); sb.append(" index: ").append(toIndentedString(index)).append("\n"); sb.append(" rewardInfo: ").append(toIndentedString(rewardInfo)).append("\n"); + sb.append(" feePayerInfo: ").append(toIndentedString(feePayerInfo)).append("\n"); sb.append(" systemMessages: ").append(toIndentedString(systemMessages)).append("\n"); sb.append(" addressType: ").append(toIndentedString(addressType)).append("\n"); sb.append(" requestedAmount: ").append(toIndentedString(requestedAmount)).append("\n"); @@ -1700,6 +2006,9 @@ public String toString() { sb.append(" fee: ").append(toIndentedString(fee)).append("\n"); sb.append(" networkFee: ").append(toIndentedString(networkFee)).append("\n"); sb.append(" errorDescription: ").append(toIndentedString(errorDescription)).append("\n"); + sb.append(" replacedTxHash: ").append(toIndentedString(replacedTxHash)).append("\n"); + sb.append(" nonce: ").append(toIndentedString(nonce)).append("\n"); + sb.append(" blockchainInfo: ").append(toIndentedString(blockchainInfo)).append("\n"); sb.append("}"); return sb.toString(); } @@ -1825,6 +2134,16 @@ public String toUrlQueryString(String prefix) { ApiClient.urlEncode(ApiClient.valueToString(getAssetId())))); } + // add `assetType` to the URL query string + if (getAssetType() != null) { + joiner.add( + String.format( + "%sassetType%s=%s", + prefix, + suffix, + ApiClient.urlEncode(ApiClient.valueToString(getAssetType())))); + } + // add `source` to the URL query string if (getSource() != null) { joiner.add(getSource().toUrlQueryString(prefix + "source" + suffix)); @@ -2065,6 +2384,57 @@ public String toUrlQueryString(String prefix) { getComplianceResults().toUrlQueryString(prefix + "complianceResults" + suffix)); } + // add `notBroadcastByFireblocks` to the URL query string + if (getNotBroadcastByFireblocks() != null) { + joiner.add( + String.format( + "%snotBroadcastByFireblocks%s=%s", + prefix, + suffix, + ApiClient.urlEncode( + ApiClient.valueToString(getNotBroadcastByFireblocks())))); + } + + // add `dappUrl` to the URL query string + if (getDappUrl() != null) { + joiner.add( + String.format( + "%sdappUrl%s=%s", + prefix, + suffix, + ApiClient.urlEncode(ApiClient.valueToString(getDappUrl())))); + } + + // add `gasLimit` to the URL query string + if (getGasLimit() != null) { + joiner.add( + String.format( + "%sgasLimit%s=%s", + prefix, + suffix, + ApiClient.urlEncode(ApiClient.valueToString(getGasLimit())))); + } + + // add `blockchainIndex` to the URL query string + if (getBlockchainIndex() != null) { + joiner.add( + String.format( + "%sblockchainIndex%s=%s", + prefix, + suffix, + ApiClient.urlEncode(ApiClient.valueToString(getBlockchainIndex())))); + } + + // add `paidRent` to the URL query string + if (getPaidRent() != null) { + joiner.add( + String.format( + "%spaidRent%s=%s", + prefix, + suffix, + ApiClient.urlEncode(ApiClient.valueToString(getPaidRent())))); + } + // add `extraParameters` to the URL query string if (getExtraParameters() != null) { joiner.add( @@ -2128,6 +2498,11 @@ public String toUrlQueryString(String prefix) { joiner.add(getRewardInfo().toUrlQueryString(prefix + "rewardInfo" + suffix)); } + // add `feePayerInfo` to the URL query string + if (getFeePayerInfo() != null) { + joiner.add(getFeePayerInfo().toUrlQueryString(prefix + "feePayerInfo" + suffix)); + } + // add `systemMessages` to the URL query string if (getSystemMessages() != null) { joiner.add(getSystemMessages().toUrlQueryString(prefix + "systemMessages" + suffix)); @@ -2223,6 +2598,36 @@ public String toUrlQueryString(String prefix) { ApiClient.urlEncode(ApiClient.valueToString(getErrorDescription())))); } + // add `replacedTxHash` to the URL query string + if (getReplacedTxHash() != null) { + joiner.add( + String.format( + "%sreplacedTxHash%s=%s", + prefix, + suffix, + ApiClient.urlEncode(ApiClient.valueToString(getReplacedTxHash())))); + } + + // add `nonce` to the URL query string + if (getNonce() != null) { + joiner.add( + String.format( + "%snonce%s=%s", + prefix, + suffix, + ApiClient.urlEncode(ApiClient.valueToString(getNonce())))); + } + + // add `blockchainInfo` to the URL query string + if (getBlockchainInfo() != null) { + joiner.add( + String.format( + "%sblockchainInfo%s=%s", + prefix, + suffix, + ApiClient.urlEncode(ApiClient.valueToString(getBlockchainInfo())))); + } + return joiner.toString(); } } diff --git a/src/main/java/com/fireblocks/sdk/model/TransactionResponseDestination.java b/src/main/java/com/fireblocks/sdk/model/TransactionResponseDestination.java index f2374803..30cbb976 100644 --- a/src/main/java/com/fireblocks/sdk/model/TransactionResponseDestination.java +++ b/src/main/java/com/fireblocks/sdk/model/TransactionResponseDestination.java @@ -22,8 +22,6 @@ /** TransactionResponseDestination */ @JsonPropertyOrder({ - TransactionResponseDestination.JSON_PROPERTY_DESTINATION_ADDRESS, - TransactionResponseDestination.JSON_PROPERTY_DESTINATION_ADDRESS_DESCRIPTION, TransactionResponseDestination.JSON_PROPERTY_AMOUNT, TransactionResponseDestination.JSON_PROPERTY_AMOUNT_U_S_D, TransactionResponseDestination.JSON_PROPERTY_AML_SCREENING_RESULT, @@ -34,13 +32,6 @@ value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0") public class TransactionResponseDestination { - public static final String JSON_PROPERTY_DESTINATION_ADDRESS = "destinationAddress"; - @jakarta.annotation.Nullable private Object destinationAddress = null; - - public static final String JSON_PROPERTY_DESTINATION_ADDRESS_DESCRIPTION = - "destinationAddressDescription"; - @jakarta.annotation.Nullable private Object destinationAddressDescription = null; - public static final String JSON_PROPERTY_AMOUNT = "amount"; @jakarta.annotation.Nullable private String amount; @@ -58,55 +49,6 @@ public class TransactionResponseDestination { public TransactionResponseDestination() {} - public TransactionResponseDestination destinationAddress( - @jakarta.annotation.Nullable Object destinationAddress) { - this.destinationAddress = destinationAddress; - return this; - } - - /** - * Address where the asset was transferred. - * - * @return destinationAddress - */ - @jakarta.annotation.Nullable - @JsonProperty(JSON_PROPERTY_DESTINATION_ADDRESS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Object getDestinationAddress() { - return destinationAddress; - } - - @JsonProperty(JSON_PROPERTY_DESTINATION_ADDRESS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDestinationAddress(@jakarta.annotation.Nullable Object destinationAddress) { - this.destinationAddress = destinationAddress; - } - - public TransactionResponseDestination destinationAddressDescription( - @jakarta.annotation.Nullable Object destinationAddressDescription) { - this.destinationAddressDescription = destinationAddressDescription; - return this; - } - - /** - * Description of the address. - * - * @return destinationAddressDescription - */ - @jakarta.annotation.Nullable - @JsonProperty(JSON_PROPERTY_DESTINATION_ADDRESS_DESCRIPTION) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Object getDestinationAddressDescription() { - return destinationAddressDescription; - } - - @JsonProperty(JSON_PROPERTY_DESTINATION_ADDRESS_DESCRIPTION) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDestinationAddressDescription( - @jakarta.annotation.Nullable Object destinationAddressDescription) { - this.destinationAddressDescription = destinationAddressDescription; - } - public TransactionResponseDestination amount(@jakarta.annotation.Nullable String amount) { this.amount = amount; return this; @@ -239,12 +181,7 @@ public boolean equals(Object o) { } TransactionResponseDestination transactionResponseDestination = (TransactionResponseDestination) o; - return Objects.equals( - this.destinationAddress, transactionResponseDestination.destinationAddress) - && Objects.equals( - this.destinationAddressDescription, - transactionResponseDestination.destinationAddressDescription) - && Objects.equals(this.amount, transactionResponseDestination.amount) + return Objects.equals(this.amount, transactionResponseDestination.amount) && Objects.equals(this.amountUSD, transactionResponseDestination.amountUSD) && Objects.equals( this.amlScreeningResult, transactionResponseDestination.amlScreeningResult) @@ -255,26 +192,13 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash( - destinationAddress, - destinationAddressDescription, - amount, - amountUSD, - amlScreeningResult, - destination, - authorizationInfo); + return Objects.hash(amount, amountUSD, amlScreeningResult, destination, authorizationInfo); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class TransactionResponseDestination {\n"); - sb.append(" destinationAddress: ") - .append(toIndentedString(destinationAddress)) - .append("\n"); - sb.append(" destinationAddressDescription: ") - .append(toIndentedString(destinationAddressDescription)) - .append("\n"); sb.append(" amount: ").append(toIndentedString(amount)).append("\n"); sb.append(" amountUSD: ").append(toIndentedString(amountUSD)).append("\n"); sb.append(" amlScreeningResult: ") @@ -331,27 +255,6 @@ public String toUrlQueryString(String prefix) { StringJoiner joiner = new StringJoiner("&"); - // add `destinationAddress` to the URL query string - if (getDestinationAddress() != null) { - joiner.add( - String.format( - "%sdestinationAddress%s=%s", - prefix, - suffix, - ApiClient.urlEncode(ApiClient.valueToString(getDestinationAddress())))); - } - - // add `destinationAddressDescription` to the URL query string - if (getDestinationAddressDescription() != null) { - joiner.add( - String.format( - "%sdestinationAddressDescription%s=%s", - prefix, - suffix, - ApiClient.urlEncode( - ApiClient.valueToString(getDestinationAddressDescription())))); - } - // add `amount` to the URL query string if (getAmount() != null) { joiner.add( diff --git a/src/main/java/com/fireblocks/sdk/model/TransferPeerPathType.java b/src/main/java/com/fireblocks/sdk/model/TransferPeerPathType.java index 57ebc158..407b8036 100644 --- a/src/main/java/com/fireblocks/sdk/model/TransferPeerPathType.java +++ b/src/main/java/com/fireblocks/sdk/model/TransferPeerPathType.java @@ -44,7 +44,9 @@ public enum TransferPeerPathType { PROGRAM_CALL("PROGRAM_CALL"), - MULTI_DESTINATION("MULTI_DESTINATION"); + MULTI_DESTINATION("MULTI_DESTINATION"), + + OEC_PARTNER("OEC_PARTNER"); private String value; diff --git a/src/test/java/com/fireblocks/sdk/api/ExchangeAccountsApiTest.java b/src/test/java/com/fireblocks/sdk/api/ExchangeAccountsApiTest.java index 3c46225f..e8445369 100644 --- a/src/test/java/com/fireblocks/sdk/api/ExchangeAccountsApiTest.java +++ b/src/test/java/com/fireblocks/sdk/api/ExchangeAccountsApiTest.java @@ -21,12 +21,11 @@ import com.fireblocks.sdk.model.ConvertAssetsResponse; import com.fireblocks.sdk.model.CreateInternalTransferRequest; import com.fireblocks.sdk.model.ExchangeAccount; -import com.fireblocks.sdk.model.ExchangeAccountsPaged; import com.fireblocks.sdk.model.ExchangeAsset; import com.fireblocks.sdk.model.GetExchangeAccountsCredentialsPublicKeyResponse; +import com.fireblocks.sdk.model.GetPagedExchangeAccountsResponse; import com.fireblocks.sdk.model.InternalTransferResponse; import java.math.BigDecimal; -import java.util.List; import java.util.concurrent.CompletableFuture; import org.junit.Ignore; import org.junit.Test; @@ -123,7 +122,7 @@ public void getPagedExchangeAccountsTest() throws ApiException { BigDecimal limit = null; String before = null; String after = null; - CompletableFuture>> response = + CompletableFuture> response = api.getPagedExchangeAccounts(limit, before, after); } diff --git a/src/test/java/com/fireblocks/sdk/api/SmartTransferApiTest.java b/src/test/java/com/fireblocks/sdk/api/SmartTransferApiTest.java index 4b0ea8e6..ca40e724 100644 --- a/src/test/java/com/fireblocks/sdk/api/SmartTransferApiTest.java +++ b/src/test/java/com/fireblocks/sdk/api/SmartTransferApiTest.java @@ -265,6 +265,8 @@ public void searchTicketsTest() throws ApiException { String externalRefId = null; String after = null; BigDecimal limit = null; + String sortBy = null; + String order = null; CompletableFuture> response = api.searchTickets( q, @@ -276,7 +278,9 @@ public void searchTicketsTest() throws ApiException { type, externalRefId, after, - limit); + limit, + sortBy, + order); } /** diff --git a/src/test/java/com/fireblocks/sdk/model/FeeInfoTest.java b/src/test/java/com/fireblocks/sdk/model/FeeInfoTest.java index 8f45fbe6..115d8e80 100644 --- a/src/test/java/com/fireblocks/sdk/model/FeeInfoTest.java +++ b/src/test/java/com/fireblocks/sdk/model/FeeInfoTest.java @@ -43,6 +43,18 @@ void gasPriceTest() { // TODO: test gasPrice } + /** Test the property 'l1networkFee' */ + @Test + void l1networkFeeTest() { + // TODO: test l1networkFee + } + + /** Test the property 'l2networkFee' */ + @Test + void l2networkFeeTest() { + // TODO: test l2networkFee + } + /** Test the property 'paidByRelay' */ @Test void paidByRelayTest() { diff --git a/src/test/java/com/fireblocks/sdk/model/FeePayerInfoTest.java b/src/test/java/com/fireblocks/sdk/model/FeePayerInfoTest.java new file mode 100644 index 00000000..8d4a6fe5 --- /dev/null +++ b/src/test/java/com/fireblocks/sdk/model/FeePayerInfoTest.java @@ -0,0 +1,33 @@ +/* + * Fireblocks API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 1.6.2 + * Contact: support@fireblocks.com + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package com.fireblocks.sdk.model; + + +import org.junit.jupiter.api.Test; + +/** Model tests for FeePayerInfo */ +class FeePayerInfoTest { + private final FeePayerInfo model = new FeePayerInfo(); + + /** Model tests for FeePayerInfo */ + @Test + void testFeePayerInfo() { + // TODO: test FeePayerInfo + } + + /** Test the property 'feePayerAccountId' */ + @Test + void feePayerAccountIdTest() { + // TODO: test feePayerAccountId + } +} diff --git a/src/test/java/com/fireblocks/sdk/model/ExchangeAccountsPagedPagingTest.java b/src/test/java/com/fireblocks/sdk/model/GetPagedExchangeAccountsResponsePagingTest.java similarity index 62% rename from src/test/java/com/fireblocks/sdk/model/ExchangeAccountsPagedPagingTest.java rename to src/test/java/com/fireblocks/sdk/model/GetPagedExchangeAccountsResponsePagingTest.java index 9dcc79f8..201b5953 100644 --- a/src/test/java/com/fireblocks/sdk/model/ExchangeAccountsPagedPagingTest.java +++ b/src/test/java/com/fireblocks/sdk/model/GetPagedExchangeAccountsResponsePagingTest.java @@ -15,14 +15,15 @@ import org.junit.jupiter.api.Test; -/** Model tests for ExchangeAccountsPagedPaging */ -class ExchangeAccountsPagedPagingTest { - private final ExchangeAccountsPagedPaging model = new ExchangeAccountsPagedPaging(); +/** Model tests for GetPagedExchangeAccountsResponsePaging */ +class GetPagedExchangeAccountsResponsePagingTest { + private final GetPagedExchangeAccountsResponsePaging model = + new GetPagedExchangeAccountsResponsePaging(); - /** Model tests for ExchangeAccountsPagedPaging */ + /** Model tests for GetPagedExchangeAccountsResponsePaging */ @Test - void testExchangeAccountsPagedPaging() { - // TODO: test ExchangeAccountsPagedPaging + void testGetPagedExchangeAccountsResponsePaging() { + // TODO: test GetPagedExchangeAccountsResponsePaging } /** Test the property 'after' */ diff --git a/src/test/java/com/fireblocks/sdk/model/ExchangeAccountsPagedTest.java b/src/test/java/com/fireblocks/sdk/model/GetPagedExchangeAccountsResponseTest.java similarity index 63% rename from src/test/java/com/fireblocks/sdk/model/ExchangeAccountsPagedTest.java rename to src/test/java/com/fireblocks/sdk/model/GetPagedExchangeAccountsResponseTest.java index d0919dbd..cff39cae 100644 --- a/src/test/java/com/fireblocks/sdk/model/ExchangeAccountsPagedTest.java +++ b/src/test/java/com/fireblocks/sdk/model/GetPagedExchangeAccountsResponseTest.java @@ -15,20 +15,20 @@ import org.junit.jupiter.api.Test; -/** Model tests for ExchangeAccountsPaged */ -class ExchangeAccountsPagedTest { - private final ExchangeAccountsPaged model = new ExchangeAccountsPaged(); +/** Model tests for GetPagedExchangeAccountsResponse */ +class GetPagedExchangeAccountsResponseTest { + private final GetPagedExchangeAccountsResponse model = new GetPagedExchangeAccountsResponse(); - /** Model tests for ExchangeAccountsPaged */ + /** Model tests for GetPagedExchangeAccountsResponse */ @Test - void testExchangeAccountsPaged() { - // TODO: test ExchangeAccountsPaged + void testGetPagedExchangeAccountsResponse() { + // TODO: test GetPagedExchangeAccountsResponse } - /** Test the property 'exchangeAccount' */ + /** Test the property 'exchanges' */ @Test - void exchangeAccountTest() { - // TODO: test exchangeAccount + void exchangesTest() { + // TODO: test exchanges } /** Test the property 'paging' */ diff --git a/src/test/java/com/fireblocks/sdk/model/NetworkRecordTest.java b/src/test/java/com/fireblocks/sdk/model/NetworkRecordTest.java index 245f636c..765c9079 100644 --- a/src/test/java/com/fireblocks/sdk/model/NetworkRecordTest.java +++ b/src/test/java/com/fireblocks/sdk/model/NetworkRecordTest.java @@ -79,24 +79,12 @@ void destinationAddressTest() { // TODO: test destinationAddress } - /** Test the property 'sourceAddress' */ - @Test - void sourceAddressTest() { - // TODO: test sourceAddress - } - /** Test the property 'amountUSD' */ @Test void amountUSDTest() { // TODO: test amountUSD } - /** Test the property 'index' */ - @Test - void indexTest() { - // TODO: test index - } - /** Test the property 'rewardInfo' */ @Test void rewardInfoTest() { diff --git a/src/test/java/com/fireblocks/sdk/model/TransactionResponseDestinationTest.java b/src/test/java/com/fireblocks/sdk/model/TransactionResponseDestinationTest.java index 90c3ef1a..ca607cae 100644 --- a/src/test/java/com/fireblocks/sdk/model/TransactionResponseDestinationTest.java +++ b/src/test/java/com/fireblocks/sdk/model/TransactionResponseDestinationTest.java @@ -25,18 +25,6 @@ void testTransactionResponseDestination() { // TODO: test TransactionResponseDestination } - /** Test the property 'destinationAddress' */ - @Test - void destinationAddressTest() { - // TODO: test destinationAddress - } - - /** Test the property 'destinationAddressDescription' */ - @Test - void destinationAddressDescriptionTest() { - // TODO: test destinationAddressDescription - } - /** Test the property 'amount' */ @Test void amountTest() { diff --git a/src/test/java/com/fireblocks/sdk/model/TransactionResponseTest.java b/src/test/java/com/fireblocks/sdk/model/TransactionResponseTest.java index 224e6bed..36823cda 100644 --- a/src/test/java/com/fireblocks/sdk/model/TransactionResponseTest.java +++ b/src/test/java/com/fireblocks/sdk/model/TransactionResponseTest.java @@ -73,6 +73,12 @@ void assetIdTest() { // TODO: test assetId } + /** Test the property 'assetType' */ + @Test + void assetTypeTest() { + // TODO: test assetType + } + /** Test the property 'source' */ @Test void sourceTest() { @@ -217,6 +223,36 @@ void complianceResultsTest() { // TODO: test complianceResults } + /** Test the property 'notBroadcastByFireblocks' */ + @Test + void notBroadcastByFireblocksTest() { + // TODO: test notBroadcastByFireblocks + } + + /** Test the property 'dappUrl' */ + @Test + void dappUrlTest() { + // TODO: test dappUrl + } + + /** Test the property 'gasLimit' */ + @Test + void gasLimitTest() { + // TODO: test gasLimit + } + + /** Test the property 'blockchainIndex' */ + @Test + void blockchainIndexTest() { + // TODO: test blockchainIndex + } + + /** Test the property 'paidRent' */ + @Test + void paidRentTest() { + // TODO: test paidRent + } + /** Test the property 'extraParameters' */ @Test void extraParametersTest() { @@ -253,6 +289,12 @@ void rewardInfoTest() { // TODO: test rewardInfo } + /** Test the property 'feePayerInfo' */ + @Test + void feePayerInfoTest() { + // TODO: test feePayerInfo + } + /** Test the property 'systemMessages' */ @Test void systemMessagesTest() { @@ -312,4 +354,22 @@ void networkFeeTest() { void errorDescriptionTest() { // TODO: test errorDescription } + + /** Test the property 'replacedTxHash' */ + @Test + void replacedTxHashTest() { + // TODO: test replacedTxHash + } + + /** Test the property 'nonce' */ + @Test + void nonceTest() { + // TODO: test nonce + } + + /** Test the property 'blockchainInfo' */ + @Test + void blockchainInfoTest() { + // TODO: test blockchainInfo + } }