Skip to content

Commit af85478

Browse files
yanivmoyanivmo
authored
Merge pull request #168 from fireblocks/PIK-9340-support-solana-across-all-exchange-integrations-nlv-2
SPL and Jetton support
2 parents 2a9c612 + ea16915 commit af85478

File tree

9 files changed

+175
-2522
lines changed

9 files changed

+175
-2522
lines changed

‎v2/api-validator/capability-presets/all-capabilities/assets.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,5 +206,25 @@
206206
"decimalPlaces": -30540099,
207207
"testAsset": true,
208208
"type": "BucketAsset"
209+
},
210+
{
211+
"id": "8d156559-8ecf-4170-acb8-a2cfa76bc3f4",
212+
"type": "SplToken",
213+
"blockchain": "Solana",
214+
"name": "USD Coin",
215+
"symbol": "USDC",
216+
"description": "The world's largest regulated stablecoin powering global finance",
217+
"decimalPlaces": 6,
218+
"mintAddress": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
219+
},
220+
{
221+
"id": "7df38516-a9bd-42cd-9ac3-284f665ca6e8",
222+
"type": "Jetton",
223+
"blockchain": "TON",
224+
"name": "Tether USD",
225+
"symbol": "USDT",
226+
"decimalPlaces": 6,
227+
"testAsset": true,
228+
"contractAddress": "EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs"
209229
}
210230
]

‎v2/api-validator/src/client/generated/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ export type { CollateralWithdrawalTransactions } from './models/CollateralWithdr
7272
export { CollateralWithdrawalTransactionStatus } from './models/CollateralWithdrawalTransactionStatus';
7373
export type { CommonRamp } from './models/CommonRamp';
7474
export type { CommonRampRequestProperties } from './models/CommonRampRequestProperties';
75+
export { ContractBasedToken } from './models/ContractBasedToken';
7576
export type { ConversionPairIdQueryParam } from './models/ConversionPairIdQueryParam';
7677
export { CountryAlpha2Code } from './models/CountryAlpha2Code';
7778
export type { CryptocurrencyReference } from './models/CryptocurrencyReference';
@@ -208,6 +209,7 @@ export { SettlementTransactionStatus } from './models/SettlementTransactionStatu
208209
export type { SettlementVersionPathParam } from './models/SettlementVersionPathParam';
209210
export type { SettlementWithdrawInstruction } from './models/SettlementWithdrawInstruction';
210211
export type { SettlementWithdrawTransaction } from './models/SettlementWithdrawTransaction';
212+
export { SolanaToken } from './models/SolanaToken';
211213
export type { SpeiAddress } from './models/SpeiAddress';
212214
export { SpeiCapability } from './models/SpeiCapability';
213215
export type { SpeiTransfer } from './models/SpeiTransfer';

‎v2/api-validator/src/client/generated/models/AssetDefinition.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55

66
import type { Bep20Token } from './Bep20Token';
77
import type { BucketAsset } from './BucketAsset';
8+
import type { ContractBasedToken } from './ContractBasedToken';
89
import type { Erc20Token } from './Erc20Token';
10+
import type { SolanaToken } from './SolanaToken';
911
import type { StellarToken } from './StellarToken';
1012

11-
export type AssetDefinition = (BucketAsset | Erc20Token | Bep20Token | StellarToken);
13+
export type AssetDefinition = (BucketAsset | Erc20Token | Bep20Token | StellarToken | ContractBasedToken | SolanaToken);
1214

‎v2/api-validator/src/client/generated/models/Blockchain.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export enum Blockchain {
1111
AVALANCHE = 'Avalanche',
1212
AXELAR = 'Axelar',
1313
BASE = 'Base',
14+
BERACHAIN = 'Berachain',
1415
BITCOIN = 'Bitcoin',
1516
BITCOIN_CASH = 'Bitcoin Cash',
1617
BITCOIN_CASH_ABC = 'Bitcoin Cash ABC',
@@ -61,6 +62,7 @@ export enum Blockchain {
6162
TERRA_2_0 = 'Terra 2.0',
6263
TERRA_CLASSIC = 'Terra Classic',
6364
TEZOS = 'Tezos',
65+
TON = 'TON',
6466
TOKEN_EX = 'TokenEX',
6567
TRON = 'TRON',
6668
VELAS = 'Velas',

‎v2/api-validator/src/client/generated/models/ContractBasedToken.ts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/* generated using openapi-typescript-codegen -- do no edit */
2+
/* istanbul ignore file */
3+
/* tslint:disable */
4+
/* eslint-disable */
5+
6+
import type { AssetCommonProperties } from './AssetCommonProperties';
7+
import type { Blockchain } from './Blockchain';
8+
9+
export type ContractBasedToken = (AssetCommonProperties & {
10+
type: ContractBasedToken.type;
11+
blockchain: Blockchain;
12+
contractAddress: string;
13+
});
14+
15+
export namespace ContractBasedToken {
16+
17+
export enum type {
18+
JETTON = 'Jetton',
19+
}
20+
21+
22+
}
23+

‎v2/api-validator/src/client/generated/models/SolanaToken.ts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/* generated using openapi-typescript-codegen -- do no edit */
2+
/* istanbul ignore file */
3+
/* tslint:disable */
4+
/* eslint-disable */
5+
6+
import type { AssetCommonProperties } from './AssetCommonProperties';
7+
import type { Blockchain } from './Blockchain';
8+
9+
export type SolanaToken = (AssetCommonProperties & {
10+
type: SolanaToken.type;
11+
blockchain: Blockchain;
12+
mintAddress: string;
13+
});
14+
15+
export namespace SolanaToken {
16+
17+
export enum type {
18+
SPL_TOKEN = 'SplToken',
19+
}
20+
21+
22+
}
23+

‎v2/openapi/docs.html‎

Lines changed: 0 additions & 2521 deletions
This file was deleted.

‎v2/openapi/fb-provider-api.yaml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -973,12 +973,58 @@ components:
973973
stellarCurrencyCode:
974974
type: string
975975

976+
ContractBasedToken:
977+
allOf:
978+
- $ref: '#/components/schemas/AssetCommonProperties'
979+
- type: object
980+
required: [ type, blockchain, contractAddress ]
981+
properties:
982+
type:
983+
enum: [ Jetton ]
984+
blockchain:
985+
$ref: '#/components/schemas/Blockchain'
986+
contractAddress:
987+
type: string
988+
example:
989+
id: "7df38516-a9bd-42cd-9ac3-284f665ca6e8"
990+
type: "Jetton"
991+
blockchain: "TON"
992+
name: "Tether USD"
993+
symbol: "USDT"
994+
decimalPlaces: 6
995+
testAsset: true
996+
contractAddress: "EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs"
997+
998+
SolanaToken:
999+
allOf:
1000+
- $ref: '#/components/schemas/AssetCommonProperties'
1001+
- type: object
1002+
required: [ type, blockchain, mintAddress ]
1003+
properties:
1004+
type:
1005+
enum: [ SplToken ]
1006+
blockchain:
1007+
$ref: '#/components/schemas/Blockchain'
1008+
mintAddress:
1009+
type: string
1010+
example:
1011+
id: "8d156559-8ecf-4170-acb8-a2cfa76bc3f4"
1012+
type: "SplToken"
1013+
blockchain: "Solana"
1014+
name: "USD Coin"
1015+
symbol: "USDC"
1016+
description: "The world's largest regulated stablecoin powering global finance"
1017+
decimalPlaces: 6
1018+
mintAddress: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
1019+
9761020
AssetDefinition:
9771021
anyOf:
9781022
- $ref: '#/components/schemas/BucketAsset'
9791023
- $ref: '#/components/schemas/Erc20Token'
9801024
- $ref: '#/components/schemas/Bep20Token'
9811025
- $ref: '#/components/schemas/StellarToken'
1026+
- $ref: '#/components/schemas/ContractBasedToken'
1027+
- $ref: '#/components/schemas/SolanaToken'
9821028

9831029
NationalCurrency:
9841030
type: object
@@ -1064,6 +1110,7 @@ components:
10641110
- Avalanche
10651111
- Axelar
10661112
- Base
1113+
- Berachain
10671114
- Bitcoin
10681115
- Bitcoin Cash
10691116
- Bitcoin Cash ABC
@@ -1114,6 +1161,7 @@ components:
11141161
- Terra 2.0
11151162
- Terra Classic
11161163
- Tezos
1164+
- TON
11171165
- TokenEX
11181166
- TRON
11191167
- Velas

‎v2/openapi/fb-unified-openapi.yaml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3298,12 +3298,64 @@ components:
32983298
type: string
32993299
stellarCurrencyCode:
33003300
type: string
3301+
ContractBasedToken:
3302+
allOf:
3303+
- $ref: '#/components/schemas/AssetCommonProperties'
3304+
- type: object
3305+
required:
3306+
- type
3307+
- blockchain
3308+
- contractAddress
3309+
properties:
3310+
type:
3311+
enum:
3312+
- Jetton
3313+
blockchain:
3314+
$ref: '#/components/schemas/Blockchain'
3315+
contractAddress:
3316+
type: string
3317+
example:
3318+
id: 7df38516-a9bd-42cd-9ac3-284f665ca6e8
3319+
type: Jetton
3320+
blockchain: TON
3321+
name: Tether USD
3322+
symbol: USDT
3323+
decimalPlaces: 6
3324+
testAsset: true
3325+
contractAddress: EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs
3326+
SolanaToken:
3327+
allOf:
3328+
- $ref: '#/components/schemas/AssetCommonProperties'
3329+
- type: object
3330+
required:
3331+
- type
3332+
- blockchain
3333+
- mintAddress
3334+
properties:
3335+
type:
3336+
enum:
3337+
- SplToken
3338+
blockchain:
3339+
$ref: '#/components/schemas/Blockchain'
3340+
mintAddress:
3341+
type: string
3342+
example:
3343+
id: 8d156559-8ecf-4170-acb8-a2cfa76bc3f4
3344+
type: SplToken
3345+
blockchain: Solana
3346+
name: USD Coin
3347+
symbol: USDC
3348+
description: The world's largest regulated stablecoin powering global finance
3349+
decimalPlaces: 6
3350+
mintAddress: EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v
33013351
AssetDefinition:
33023352
anyOf:
33033353
- $ref: '#/components/schemas/BucketAsset'
33043354
- $ref: '#/components/schemas/Erc20Token'
33053355
- $ref: '#/components/schemas/Bep20Token'
33063356
- $ref: '#/components/schemas/StellarToken'
3357+
- $ref: '#/components/schemas/ContractBasedToken'
3358+
- $ref: '#/components/schemas/SolanaToken'
33073359
NationalCurrency:
33083360
type: object
33093361
required:
@@ -3386,6 +3438,7 @@ components:
33863438
- Avalanche
33873439
- Axelar
33883440
- Base
3441+
- Berachain
33893442
- Bitcoin
33903443
- Bitcoin Cash
33913444
- Bitcoin Cash ABC
@@ -3436,6 +3489,7 @@ components:
34363489
- Terra 2.0
34373490
- Terra Classic
34383491
- Tezos
3492+
- TON
34393493
- TokenEX
34403494
- TRON
34413495
- Velas

0 commit comments

Comments
 (0)