Skip to content

Commit 69bcad6

Browse files
bhuvanr159bhuvanr159
authored
Merge pull request #7976 from BitGo/COIN-7406-rename-okbxlayer
feat: rename 'eth:okb' to okb and okb chain to okbxlayer
2 parents e2c4789 + 4a33360 commit 69bcad6

10 files changed

Lines changed: 75 additions & 61 deletions

File tree

‎modules/bitgo/test/v2/unit/keychains.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ describe('V2 Keychains', function () {
103103
n.asset !== UnderlyingAsset.FLUENTETH &&
104104
n.asset !== UnderlyingAsset.MANTLE &&
105105
n.asset !== UnderlyingAsset.JOVAYETH &&
106-
n.asset !== UnderlyingAsset.OKB &&
106+
n.asset !== UnderlyingAsset.OKBXLAYER &&
107107
n.asset !== UnderlyingAsset.MORPH &&
108108
n.asset !== UnderlyingAsset.DOGEOS &&
109109
n.asset !== UnderlyingAsset.MEGAETH &&

‎modules/sdk-core/src/bitgo/environments.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ const mainnetBase: EnvironmentTemplate = {
291291
jovayeth: {
292292
baseUrl: 'https://api.zan.top/node/v1/jovay/mainnet/',
293293
},
294-
okb: {
294+
okbxlayer: {
295295
baseUrl: 'https://www.oklink.com/api/v5/explorer/block/block-list?chainShortName=xlayer',
296296
},
297297
morph: {
@@ -463,7 +463,7 @@ const testnetBase: EnvironmentTemplate = {
463463
jovayeth: {
464464
baseUrl: 'https://api.zan.top/node/v1/jovay/testnet/',
465465
},
466-
okb: {
466+
okbxlayer: {
467467
baseUrl: 'https://www.oklink.com/api/v5/explorer/block/block-list?chainShortName=xlayer_testnet',
468468
},
469469
morph: {

‎modules/statics/src/allCoinsAndTokens.ts‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2466,11 +2466,11 @@ export const allCoinsAndTokens = [
24662466
),
24672467
account(
24682468
'2c59a9f2-9bb0-42ff-b925-6049476b93a0',
2469-
'okb',
2469+
'okbxlayer',
24702470
'X Layer',
2471-
Networks.main.okb,
2471+
Networks.main.okbxlayer,
24722472
18,
2473-
UnderlyingAsset.OKB,
2473+
UnderlyingAsset.OKBXLAYER,
24742474
BaseUnit.ETH,
24752475
[
24762476
...EVM_FEATURES,
@@ -2486,11 +2486,11 @@ export const allCoinsAndTokens = [
24862486
),
24872487
account(
24882488
'6f29e239-1bcd-4d29-b638-e17b5efc3f6c',
2489-
'tokb',
2489+
'tokbxlayer',
24902490
'Testnet X Layer',
2491-
Networks.test.okb,
2491+
Networks.test.okbxlayer,
24922492
18,
2493-
UnderlyingAsset.OKB,
2493+
UnderlyingAsset.OKBXLAYER,
24942494
BaseUnit.ETH,
24952495
[
24962496
...EVM_FEATURES,
@@ -2507,50 +2507,50 @@ export const allCoinsAndTokens = [
25072507
// X Layer (OKB) mainnet tokens
25082508
erc20Token(
25092509
'636c562a-87a1-4d9b-acbb-211d41b73967',
2510-
'okb:usdg',
2510+
'okbxlayer:usdg',
25112511
'Global Dollar',
25122512
6,
25132513
'0x4ae46a509f6b1d9056937ba4500cb143933d2dc8',
2514-
UnderlyingAsset['okb:usdg'],
2515-
Networks.main.okb
2514+
UnderlyingAsset['okbxlayer:usdg'],
2515+
Networks.main.okbxlayer
25162516
),
25172517
erc20Token(
25182518
'34c6e62c-1926-49c0-b31d-72363745fc18',
2519-
'okb:usdt0',
2519+
'okbxlayer:usdt0',
25202520
'USDT0',
25212521
6,
25222522
'0x779ded0c9e1022225f8e0630b35a9b54be713736',
2523-
UnderlyingAsset['okb:usdt0'],
2524-
Networks.main.okb
2523+
UnderlyingAsset['okbxlayer:usdt0'],
2524+
Networks.main.okbxlayer
25252525
),
25262526
erc20Token(
25272527
'd21681a2-1d13-41db-8813-76bfd9b0b23e',
2528-
'okb:usdt',
2528+
'okbxlayer:usdt',
25292529
'USDT',
25302530
6,
25312531
'0x1e4a5963abfd975d8c9021ce480b42188849d41d',
2532-
UnderlyingAsset['okb:usdt'],
2533-
Networks.main.okb
2532+
UnderlyingAsset['okbxlayer:usdt'],
2533+
Networks.main.okbxlayer
25342534
),
25352535
erc20Token(
25362536
'68387219-4c67-4ccc-abc5-76a5dd1ca964',
2537-
'okb:usdc',
2537+
'okbxlayer:usdc',
25382538
'USDC',
25392539
6,
25402540
'0x74b7f16337b8972027f6196a17a631ac6de26d22',
2541-
UnderlyingAsset['okb:usdc'],
2542-
Networks.main.okb
2541+
UnderlyingAsset['okbxlayer:usdc'],
2542+
Networks.main.okbxlayer
25432543
),
25442544

25452545
// X Layer (OKB) testnet tokens
25462546
erc20Token(
25472547
'2b149c11-d8d6-4d5e-88f6-3d1372592201',
2548-
'tokb:tzeb',
2548+
'tokbxlayer:tzeb',
25492549
'Zebra testnet',
25502550
18,
25512551
'0x8ab88ea756a039abe3e2590c1adc90e7d9ee47e9',
2552-
UnderlyingAsset['tokb:tzeb'],
2553-
Networks.test.okb
2552+
UnderlyingAsset['tokbxlayer:tzeb'],
2553+
Networks.test.okbxlayer
25542554
),
25552555

25562556
account(

‎modules/statics/src/base.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export enum CoinFamily {
9090
OFC = 'ofc',
9191
OG = 'og',
9292
OPBNB = 'opbnb', // opBNB Chain
93-
OKB = 'okb',
93+
OKBXLAYER = 'okbxlayer',
9494
OPETH = 'opeth',
9595
OSMO = 'osmo',
9696
PLUME = 'plume',
@@ -612,7 +612,7 @@ export enum UnderlyingAsset {
612612
NEAR = 'near',
613613
OAS = 'oas',
614614
OG = 'og',
615-
OKB = 'okb',
615+
OKBXLAYER = 'okbxlayer',
616616
OPBNB = 'opbnb', // opBNB Chain
617617
OPETH = 'opeth',
618618
OSMO = 'osmo',
@@ -1477,6 +1477,7 @@ export enum UnderlyingAsset {
14771477
OCTAV = 'octav',
14781478
OGN = 'ogn',
14791479
OGV = 'ogv',
1480+
OKB = 'okb',
14801481
OKBBEAR = 'okbbear',
14811482
OKBBULL = 'okbbull',
14821483
OKBDOOM = 'okbdoom',
@@ -2082,7 +2083,6 @@ export enum UnderlyingAsset {
20822083
'ZRO-0xE5C' = 'zro-0xe5c',
20832084
ZRX = 'zrx',
20842085
ZUSD = 'zusd',
2085-
'eth:okb' = 'eth:okb',
20862086
'eth:usdg' = 'eth:usdg',
20872087
'eth:spxux' = 'eth:spxux',
20882088
'eth:aleo' = 'eth:aleo',
@@ -3028,13 +3028,13 @@ export enum UnderlyingAsset {
30283028
'tjovayeth:tcmn' = 'tjovayeth:tcmn',
30293029

30303030
// X Layer (OKB) mainnet tokens
3031-
'okb:usdg' = 'okb:usdg',
3032-
'okb:usdt0' = 'okb:usdt0',
3033-
'okb:usdt' = 'okb:usdt',
3034-
'okb:usdc' = 'okb:usdc',
3031+
'okbxlayer:usdg' = 'okbxlayer:usdg',
3032+
'okbxlayer:usdt0' = 'okbxlayer:usdt0',
3033+
'okbxlayer:usdt' = 'okbxlayer:usdt',
3034+
'okbxlayer:usdc' = 'okbxlayer:usdc',
30353035

30363036
// X Layer (OKB) testnet tokens
3037-
'tokb:tzeb' = 'tokb:tzeb',
3037+
'tokbxlayer:tzeb' = 'tokbxlayer:tzeb',
30383038

30393039
// Story testnet tokens
30403040
'tip:usdc' = 'tip:usdc',

‎modules/statics/src/coins/erc20Coins.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4445,11 +4445,11 @@ export const erc20Coins = [
44454445
),
44464446
erc20(
44474447
'987fa929-39ff-40a2-9249-d7b3be9dc76d',
4448-
'eth:okb',
4449-
'OKB ETH Token',
4448+
'okb',
4449+
'OKB',
44504450
18,
44514451
'0x75231f58b43240c9718dd58b4967c5114342a86c',
4452-
UnderlyingAsset['eth:okb']
4452+
UnderlyingAsset.OKB
44534453
),
44544454
erc20(
44554455
'68a5e76f-cb79-4016-a35e-f88b5a391d95',

‎modules/statics/src/coins/ofcCoins.ts‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,22 @@ export const ofcCoins = [
297297
UnderlyingAsset.MORPH,
298298
CoinKind.CRYPTO
299299
),
300-
ofc('dc733b2f-92bf-49d3-9f5d-9774e1637f0f', 'ofcokb', 'X Layer', 18, UnderlyingAsset.OKB, CoinKind.CRYPTO),
301-
tofc('98460a7d-0677-4dbd-934e-fbb0e9c5f8cc', 'ofctokb', 'X Layer Testnet', 18, UnderlyingAsset.OKB, CoinKind.CRYPTO),
300+
ofc(
301+
'dc733b2f-92bf-49d3-9f5d-9774e1637f0f',
302+
'ofcokbxlayer',
303+
'X Layer',
304+
18,
305+
UnderlyingAsset.OKBXLAYER,
306+
CoinKind.CRYPTO
307+
),
308+
tofc(
309+
'98460a7d-0677-4dbd-934e-fbb0e9c5f8cc',
310+
'ofctokbxlayer',
311+
'X Layer Testnet',
312+
18,
313+
UnderlyingAsset.OKBXLAYER,
314+
CoinKind.CRYPTO
315+
),
302316
ofc(
303317
'357901a6-9f4f-444c-abfd-c2f32638f0cb',
304318
'ofcmantle',

‎modules/statics/src/coins/ofcErc20Coins.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ export const ofcErc20Coins = [
206206
CoinFeature.STABLECOIN,
207207
]),
208208
ofcerc20('dec90842-ca08-417e-9cb0-89723cc50b77', 'ofcwbtc', 'Wrapped Bitcoin', 8, UnderlyingAsset.WBTC),
209-
ofcerc20('8f01bcec-f576-49f8-b925-274566954017', 'ofceth:okb', 'OKB ETH Token', 18, UnderlyingAsset['eth:okb']),
209+
ofcerc20('8f01bcec-f576-49f8-b925-274566954017', 'ofcokb', 'OKB', 18, UnderlyingAsset.OKB),
210210
ofcerc20('37e7d659-c3a4-4761-8f42-76fb7bc5032c', 'ofcmnt', 'Mantle', 18, UnderlyingAsset.MNT),
211211
ofcerc20('688725ff-e582-44bc-b42e-0de600426594', 'ofcstrk', 'StarkNet Token', 18, UnderlyingAsset.STRK),
212212
ofcerc20('d6d6ee90-05c1-4fdd-8621-bfaefaa703ae', 'ofctkx', 'Tokenize', 8, UnderlyingAsset.TKX),
@@ -5106,75 +5106,75 @@ export const tOfcErc20Coins = [
51065106
// X Layer (OKB) Mainnet tokens
51075107
ofcerc20(
51085108
'74624f51-a9ee-4e08-a3d8-3f59221dd782',
5109-
'ofcokb:usdg',
5109+
'ofcokbxlayer:usdg',
51105110
'Global Dollar',
51115111
6,
5112-
underlyingAssetForSymbol('okb:usdg'),
5112+
underlyingAssetForSymbol('okbxlayer:usdg'),
51135113
undefined,
51145114
undefined,
51155115
'',
51165116
undefined,
51175117
undefined,
51185118
true,
5119-
'okb'
5119+
'okbxlayer'
51205120
),
51215121
ofcerc20(
51225122
'586b6383-f965-4f6a-9d40-e135ad815147',
5123-
'ofcokb:usdt0',
5123+
'ofcokbxlayer:usdt0',
51245124
'USDT0',
51255125
6,
5126-
underlyingAssetForSymbol('okb:usdt0'),
5126+
underlyingAssetForSymbol('okbxlayer:usdt0'),
51275127
undefined,
51285128
undefined,
51295129
'',
51305130
undefined,
51315131
undefined,
51325132
true,
5133-
'okb'
5133+
'okbxlayer'
51345134
),
51355135
ofcerc20(
51365136
'560de5af-59c2-421c-bb60-9086a5745539',
5137-
'ofcokb:usdt',
5137+
'ofcokbxlayer:usdt',
51385138
'USDT',
51395139
6,
5140-
underlyingAssetForSymbol('okb:usdt'),
5140+
underlyingAssetForSymbol('okbxlayer:usdt'),
51415141
undefined,
51425142
undefined,
51435143
'',
51445144
undefined,
51455145
undefined,
51465146
true,
5147-
'okb'
5147+
'okbxlayer'
51485148
),
51495149
ofcerc20(
51505150
'f22e7b40-8bfb-42b7-a741-44bb36088a50',
5151-
'ofcokb:usdc',
5151+
'ofcokbxlayer:usdc',
51525152
'USDC',
51535153
6,
5154-
underlyingAssetForSymbol('okb:usdc'),
5154+
underlyingAssetForSymbol('okbxlayer:usdc'),
51555155
undefined,
51565156
undefined,
51575157
'',
51585158
undefined,
51595159
undefined,
51605160
true,
5161-
'okb'
5161+
'okbxlayer'
51625162
),
51635163

51645164
// X Layer (OKB) Testnet tokens
51655165
tofcerc20(
51665166
'1be3bd63-04d8-43f5-a772-86292fa5631d',
5167-
'ofctokb:tzeb',
5167+
'ofctokbxlayer:tzeb',
51685168
'Zebra testnet',
51695169
18,
5170-
underlyingAssetForSymbol('tokb:tzeb'),
5170+
underlyingAssetForSymbol('tokbxlayer:tzeb'),
51715171
undefined,
51725172
undefined,
51735173
'',
51745174
undefined,
51755175
undefined,
51765176
true,
5177-
'tokb'
5177+
'tokbxlayer'
51785178
),
51795179

51805180
// Jovayeth Mainnet tokens

‎modules/statics/src/map.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ export class CoinMap {
158158
4326: 'megaeth',
159159
295: 'hbarevm',
160160
296: 'thbarevm',
161-
196: 'okb',
162-
1952: 'tokb',
161+
196: 'okbxlayer',
162+
1952: 'tokbxlayer',
163163
5734951: 'jovayeth',
164164
2019775: 'tjovayeth',
165165
5042002: 'tarcusdc',

‎modules/statics/src/networks.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1672,7 +1672,7 @@ class JovayETHTestnet extends Testnet implements EthereumNetwork {
16721672

16731673
class Xlayer extends Mainnet implements EthereumNetwork {
16741674
name = 'X Layer';
1675-
family = CoinFamily.OKB;
1675+
family = CoinFamily.OKBXLAYER;
16761676
explorerUrl = 'https://www.oklink.com/x-layer/tx/';
16771677
accountExplorerUrl = 'https://www.oklink.com/x-layer/address/';
16781678
chainId = 196;
@@ -1681,7 +1681,7 @@ class Xlayer extends Mainnet implements EthereumNetwork {
16811681

16821682
class XlayerTestnet extends Testnet implements EthereumNetwork {
16831683
name = 'Testnet X Layer';
1684-
family = CoinFamily.OKB;
1684+
family = CoinFamily.OKBXLAYER;
16851685
explorerUrl = 'https://www.oklink.com/x-layer-testnet/tx/';
16861686
accountExplorerUrl = 'https://www.oklink.com/x-layer-testnet/address/';
16871687
chainId = 1952;
@@ -2400,7 +2400,7 @@ export const Networks = {
24002400
oas: Object.freeze(new Oas()),
24012401
og: Object.freeze(new Og()),
24022402
ofc: Object.freeze(new Ofc()),
2403-
okb: Object.freeze(new Xlayer()),
2403+
okbxlayer: Object.freeze(new Xlayer()),
24042404
opbnb: Object.freeze(new OpBNB()),
24052405
fantom: Object.freeze(new Fantom()),
24062406
morph: Object.freeze(new Morph()),
@@ -2512,7 +2512,7 @@ export const Networks = {
25122512
oas: Object.freeze(new OasTestnet()),
25132513
og: Object.freeze(new OgTestnet()),
25142514
ofc: Object.freeze(new OfcTestnet()),
2515-
okb: Object.freeze(new XlayerTestnet()),
2515+
okbxlayer: Object.freeze(new XlayerTestnet()),
25162516
opbnb: Object.freeze(new OpBNBTestnet()),
25172517
fantom: Object.freeze(new FantomTestnet()),
25182518
morph: Object.freeze(new MorphTestnet()),

‎modules/statics/test/unit/fixtures/expectedColdFeatures.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ export const expectedColdFeatures = {
111111
'near',
112112
'oas',
113113
'og',
114-
'okb',
114+
'okbxlayer',
115115
'osmo',
116116
'plume',
117117
'polyx',
@@ -158,7 +158,7 @@ export const expectedColdFeatures = {
158158
'thbarevm',
159159
'tjovayeth',
160160
'tog',
161-
'tokb',
161+
'tokbxlayer',
162162
'tmorph',
163163
'tmegaeth',
164164
'tmon',

0 commit comments

Comments
 (0)