Skip to content

Commit a9cf115

Browse files
1biest1biest
authored
Merge branch 'InjectiveLabs:master' into master
2 parents 18425b3 + a6b5ea4 commit a9cf115

72 files changed

Lines changed: 123120 additions & 6141 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/master.yaml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -221,18 +221,9 @@ jobs:
221221

222222
- name: Sync files to S3 bucket
223223
run: |
224-
aws s3 sync json s3://injective-lists/json --delete \
224+
aws s3 sync json s3://injective-lists-staging/json --delete \
225225
--cache-control "public, max-age=31536000, s-maxage=31536000"
226226
227227
- name: Invalidate CloudFront cache
228228
run: |
229229
aws cloudfront create-invalidation --distribution-id ${{ secrets.STAGING_CLOUDFRONT_DISTRIBUTION_ID }} --paths "/*"
230-
231-
- name: Sleep for 60s
232-
uses: juliangruber/sleep-action@v2.0.0
233-
with:
234-
time: 60s
235-
236-
- name: Invalidate CloudFront cache
237-
run: |
238-
aws cloudfront create-invalidation --distribution-id ${{ secrets.STAGING_CLOUDFRONT_DISTRIBUTION_ID }} --paths "/*"

‎.github/workflows/upload-staging.yaml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Injective list - Upload Files (Staging)
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
deploy:
8+
name: "Trigger upload"
9+
runs-on: blacksmith-8vcpu-ubuntu-2204
10+
env:
11+
## Github Actions
12+
SKIP_DEPLOYMENTS: ${{ secrets.SKIP_DEPLOYMENTS }}
13+
14+
steps:
15+
- name: Install Act dependencies
16+
if: ${{ env.ACT }}
17+
run: |
18+
apt-get update && apt-get install sudo -y && apt-get install wget -y && apt-get install unzip -y
19+
20+
- name: Install AWS if running locally
21+
if: ${{ env.ACT }}
22+
uses: unfor19/install-aws-cli-action@v1
23+
with:
24+
version: 2 # default
25+
verbose: true # default
26+
arch: amd64 # allowed values: amd64, arm64
27+
28+
- name: Checkout
29+
uses: actions/checkout@main
30+
31+
- name: Setup AWS CLI
32+
uses: aws-actions/configure-aws-credentials@v4
33+
with:
34+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
35+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
36+
aws-region: us-east-2
37+
38+
- name: Sync files to S3 bucket
39+
run: |
40+
aws s3 sync json s3://injective-lists-staging/json --delete \
41+
--cache-control "public, max-age=31536000, s-maxage=31536000"
42+
43+
- name: Invalidate CloudFront cache
44+
run: |
45+
aws cloudfront create-invalidation --distribution-id ${{ secrets.STAGING_CLOUDFRONT_DISTRIBUTION_ID }} --paths "/*"

‎.github/workflows/upload.yaml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,3 @@ jobs:
4343
- name: Invalidate CloudFront cache
4444
run: |
4545
aws cloudfront create-invalidation --distribution-id ${{ secrets.CLOUDFRONT_DISTRIBUTION_ID }} --paths "/*"
46-
47-
- name: Sleep for 60s
48-
uses: juliangruber/sleep-action@v2.0.0
49-
with:
50-
time: 60s
51-
52-
- name: Invalidate CloudFront cache
53-
run: |
54-
aws cloudfront create-invalidation --distribution-id ${{ secrets.CLOUDFRONT_DISTRIBUTION_ID }} --paths "/*"

‎json/config/chainUpgrade.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
1-
{}
1+
{
2+
"proposalId": 541,
3+
"blockHeight": 127250000,
4+
"disableMaintenance": false,
5+
"proposalMsg": "Scheduled maintenance on July 31st, 2025 at ~14:00 UTC to implement the Injective EVM mainnet upgrade."
6+
}

‎json/config/olp.json‎

Lines changed: 53 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -10588,7 +10588,8 @@
1058810588
},
1058910589
"0x4fe7aff4dd27be7cbb924336e7fe2d160387bb1750811cf165ce58d4c612aebb": {
1059010590
"ticker": "AXL/USDT PERP",
10591-
"marketType": "derivative"
10591+
"marketType": "derivative",
10592+
"endDate": "2025-07-27T00:00:00Z"
1059210593
},
1059310594
"0x35fd4fa9291ea68ce5eef6e0ea8567c7744c1891c2059ef08580ba2e7a31f101": {
1059410595
"ticker": "TIA/USDT",
@@ -10780,7 +10781,8 @@
1078010781
},
1078110782
"0x056fd86c5b8bde4a4f03552e281db86fc6c110a13a79b98b2011aa84bb0ec340": {
1078210783
"ticker": "iMCD/USDT PERP",
10783-
"marketType": "derivative"
10784+
"marketType": "derivative",
10785+
"endDate": "2025-07-27T00:00:00Z"
1078410786
},
1078510787
"0xc785a40ccb958e8df31ab18c0788f8443cefc5cbf6aca989ca721214b31fd76e": {
1078610788
"ticker": "iHOOD/USDT PERP",
@@ -10804,7 +10806,8 @@
1080410806
},
1080510807
"0xc6c7178a6f1fa18007f81e5c8dce85be3dbce97cca68ee97321de0daf7558c6a": {
1080610808
"ticker": "SIGN/USDT PERP",
10807-
"marketType": "derivative"
10809+
"marketType": "derivative",
10810+
"endDate": "2025-07-27T00:00:00Z"
1080810811
},
1080910812
"0xe12d934dfcd58f5f633b6cb6eb4cce91e950124469bb3996282e9d9d0cb96e36": {
1081010813
"ticker": "iMETA/USDT PERP",
@@ -10828,19 +10831,22 @@
1082810831
},
1082910832
"0x3569a541bfae59b8a92215e3cb31133bff21455f1a18a1303df87fecab2839e4": {
1083010833
"ticker": "PLUME/USDT PERP",
10831-
"marketType": "derivative"
10834+
"marketType": "derivative",
10835+
"endDate": "2025-07-27T00:00:00Z"
1083210836
},
1083310837
"0x12ea31cc591984150dd2341f593c0bd3e57e3e057e8bd692806b7ac092ac529c": {
1083410838
"ticker": "WTI/USDT PERP",
10835-
"marketType": "derivative"
10839+
"marketType": "derivative",
10840+
"endDate": "2025-07-27T00:00:00Z"
1083610841
},
1083710842
"0x8a325bd4bd29e20eb182fbc6acca2224f5f4067a29e9feb44f60b01f8e5dd0f3": {
1083810843
"ticker": "iCRCL/USDT PERP",
1083910844
"marketType": "derivative"
1084010845
},
1084110846
"0x99fb44dc75753727f89bad0e79b8b9d2a69ab3cf62730ac405cfd3611569dbc0": {
1084210847
"ticker": "LAUNCHCOIN/USDT PERP",
10843-
"marketType": "derivative"
10848+
"marketType": "derivative",
10849+
"endDate": "2025-07-27T00:00:00Z"
1084410850
},
1084510851
"0xa900dc57b6dc902f6459b0300c375ecbdaed48aa5f9e3af1accbfa554e65f625": {
1084610852
"ticker": "XRP/USDT",
@@ -10850,6 +10856,11 @@
1085010856
"ticker": "PUMP/USDT PERP",
1085110857
"marketType": "derivative",
1085210858
"startDate": "2025-07-15T00:00:00Z"
10859+
},
10860+
"0xa64335c69ee025897d00880752971320c8bf35fa7346c58cd208bb8e996e95e3": {
10861+
"ticker": "SBET/USDT PERP",
10862+
"marketType": "derivative",
10863+
"startDate": "2025-07-23T00:00:00Z"
1085310864
}
1085410865
}
1085510866
},
@@ -10867,6 +10878,34 @@
1086710878
},
1086810879
"isMiniEpoch": true
1086910880
},
10881+
{
10882+
"epochId": "mini_epoch_250717_250724_01",
10883+
"number": 48102,
10884+
"startDate": "2025-07-19T00:00:00Z",
10885+
"endDate": "2025-07-26T00:00:00Z",
10886+
"rewardINJNum": "500",
10887+
"markets": {
10888+
"0x63bafbeee644b6606afb8476dd378fba35d516c7081d6045145790af963545aa": {
10889+
"ticker": "XRP/USDT PERP",
10890+
"marketType": "derivative"
10891+
}
10892+
},
10893+
"isMiniEpoch": true
10894+
},
10895+
{
10896+
"epochId": "mini_epoch_250717_250724_02",
10897+
"number": 48103,
10898+
"startDate": "2025-07-19T00:00:00Z",
10899+
"endDate": "2025-07-26T00:00:00Z",
10900+
"rewardINJNum": "500",
10901+
"markets": {
10902+
"0xa900dc57b6dc902f6459b0300c375ecbdaed48aa5f9e3af1accbfa554e65f625": {
10903+
"ticker": "XRP/USDT",
10904+
"marketType": "spot"
10905+
}
10906+
},
10907+
"isMiniEpoch": true
10908+
},
1087010909
{
1087110910
"epochId": "epoch_250805_250901",
1087210911
"number": 49,
@@ -10921,10 +10960,6 @@
1092110960
"ticker": "KAVA/USDT",
1092210961
"marketType": "spot"
1092310962
},
10924-
"0x4fe7aff4dd27be7cbb924336e7fe2d160387bb1750811cf165ce58d4c612aebb": {
10925-
"ticker": "AXL/USDT PERP",
10926-
"marketType": "derivative"
10927-
},
1092810963
"0x35fd4fa9291ea68ce5eef6e0ea8567c7744c1891c2059ef08580ba2e7a31f101": {
1092910964
"ticker": "TIA/USDT",
1093010965
"marketType": "spot"
@@ -11113,10 +11148,6 @@
1111311148
"ticker": "LTC/USDT PERP",
1111411149
"marketType": "derivative"
1111511150
},
11116-
"0x056fd86c5b8bde4a4f03552e281db86fc6c110a13a79b98b2011aa84bb0ec340": {
11117-
"ticker": "iMCD/USDT PERP",
11118-
"marketType": "derivative"
11119-
},
1112011151
"0xc785a40ccb958e8df31ab18c0788f8443cefc5cbf6aca989ca721214b31fd76e": {
1112111152
"ticker": "iHOOD/USDT PERP",
1112211153
"marketType": "derivative"
@@ -11137,10 +11168,6 @@
1113711168
"ticker": "iGOOGL/USDT PERP",
1113811169
"marketType": "derivative"
1113911170
},
11140-
"0xc6c7178a6f1fa18007f81e5c8dce85be3dbce97cca68ee97321de0daf7558c6a": {
11141-
"ticker": "SIGN/USDT PERP",
11142-
"marketType": "derivative"
11143-
},
1114411171
"0xe12d934dfcd58f5f633b6cb6eb4cce91e950124469bb3996282e9d9d0cb96e36": {
1114511172
"ticker": "iMETA/USDT PERP",
1114611173
"marketType": "derivative"
@@ -11161,29 +11188,21 @@
1116111188
"ticker": "iAAPL/USDT PERP",
1116211189
"marketType": "derivative"
1116311190
},
11164-
"0x3569a541bfae59b8a92215e3cb31133bff21455f1a18a1303df87fecab2839e4": {
11165-
"ticker": "PLUME/USDT PERP",
11166-
"marketType": "derivative"
11167-
},
11168-
"0x12ea31cc591984150dd2341f593c0bd3e57e3e057e8bd692806b7ac092ac529c": {
11169-
"ticker": "WTI/USDT PERP",
11170-
"marketType": "derivative"
11171-
},
1117211191
"0x8a325bd4bd29e20eb182fbc6acca2224f5f4067a29e9feb44f60b01f8e5dd0f3": {
1117311192
"ticker": "iCRCL/USDT PERP",
1117411193
"marketType": "derivative"
1117511194
},
11176-
"0x99fb44dc75753727f89bad0e79b8b9d2a69ab3cf62730ac405cfd3611569dbc0": {
11177-
"ticker": "LAUNCHCOIN/USDT PERP",
11178-
"marketType": "derivative"
11179-
},
1118011195
"0xa900dc57b6dc902f6459b0300c375ecbdaed48aa5f9e3af1accbfa554e65f625": {
1118111196
"ticker": "XRP/USDT",
1118211197
"marketType": "spot"
1118311198
},
1118411199
"0x2a01aab6359dd0e801716f385a74d17e0dd754c3d24238604ed7d549ddefd611": {
1118511200
"ticker": "PUMP/USDT PERP",
1118611201
"marketType": "derivative"
11202+
},
11203+
"0xa64335c69ee025897d00880752971320c8bf35fa7346c58cd208bb8e996e95e3": {
11204+
"ticker": "SBET/USDT PERP",
11205+
"marketType": "derivative"
1118711206
}
1118811207
}
1118911208
},
@@ -11241,10 +11260,6 @@
1124111260
"ticker": "KAVA/USDT",
1124211261
"marketType": "spot"
1124311262
},
11244-
"0x4fe7aff4dd27be7cbb924336e7fe2d160387bb1750811cf165ce58d4c612aebb": {
11245-
"ticker": "AXL/USDT PERP",
11246-
"marketType": "derivative"
11247-
},
1124811263
"0x35fd4fa9291ea68ce5eef6e0ea8567c7744c1891c2059ef08580ba2e7a31f101": {
1124911264
"ticker": "TIA/USDT",
1125011265
"marketType": "spot"
@@ -11433,10 +11448,6 @@
1143311448
"ticker": "LTC/USDT PERP",
1143411449
"marketType": "derivative"
1143511450
},
11436-
"0x056fd86c5b8bde4a4f03552e281db86fc6c110a13a79b98b2011aa84bb0ec340": {
11437-
"ticker": "iMCD/USDT PERP",
11438-
"marketType": "derivative"
11439-
},
1144011451
"0xc785a40ccb958e8df31ab18c0788f8443cefc5cbf6aca989ca721214b31fd76e": {
1144111452
"ticker": "iHOOD/USDT PERP",
1144211453
"marketType": "derivative"
@@ -11457,10 +11468,6 @@
1145711468
"ticker": "iGOOGL/USDT PERP",
1145811469
"marketType": "derivative"
1145911470
},
11460-
"0xc6c7178a6f1fa18007f81e5c8dce85be3dbce97cca68ee97321de0daf7558c6a": {
11461-
"ticker": "SIGN/USDT PERP",
11462-
"marketType": "derivative"
11463-
},
1146411471
"0xe12d934dfcd58f5f633b6cb6eb4cce91e950124469bb3996282e9d9d0cb96e36": {
1146511472
"ticker": "iMETA/USDT PERP",
1146611473
"marketType": "derivative"
@@ -11481,29 +11488,21 @@
1148111488
"ticker": "iAAPL/USDT PERP",
1148211489
"marketType": "derivative"
1148311490
},
11484-
"0x3569a541bfae59b8a92215e3cb31133bff21455f1a18a1303df87fecab2839e4": {
11485-
"ticker": "PLUME/USDT PERP",
11486-
"marketType": "derivative"
11487-
},
11488-
"0x12ea31cc591984150dd2341f593c0bd3e57e3e057e8bd692806b7ac092ac529c": {
11489-
"ticker": "WTI/USDT PERP",
11490-
"marketType": "derivative"
11491-
},
1149211491
"0x8a325bd4bd29e20eb182fbc6acca2224f5f4067a29e9feb44f60b01f8e5dd0f3": {
1149311492
"ticker": "iCRCL/USDT PERP",
1149411493
"marketType": "derivative"
1149511494
},
11496-
"0x99fb44dc75753727f89bad0e79b8b9d2a69ab3cf62730ac405cfd3611569dbc0": {
11497-
"ticker": "LAUNCHCOIN/USDT PERP",
11498-
"marketType": "derivative"
11499-
},
1150011495
"0xa900dc57b6dc902f6459b0300c375ecbdaed48aa5f9e3af1accbfa554e65f625": {
1150111496
"ticker": "XRP/USDT",
1150211497
"marketType": "spot"
1150311498
},
1150411499
"0x2a01aab6359dd0e801716f385a74d17e0dd754c3d24238604ed7d549ddefd611": {
1150511500
"ticker": "PUMP/USDT PERP",
1150611501
"marketType": "derivative"
11502+
},
11503+
"0xa64335c69ee025897d00880752971320c8bf35fa7346c58cd208bb8e996e95e3": {
11504+
"ticker": "SBET/USDT PERP",
11505+
"marketType": "derivative"
1150711506
}
1150811507
}
1150911508
}

‎json/helix/trading/denoms/testnet.json‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,6 @@
8181
"tokenType": "tokenFactory",
8282
"externalLogo": "ethereum.png"
8383
},
84-
"peggy0x44C21afAaF20c270EBbF5914Cfc3b5022173FEB7": {
85-
"address": "0x44C21afAaF20c270EBbF5914Cfc3b5022173FEB7",
86-
"isNative": false,
87-
"tokenVerification": "verified",
88-
"decimals": 0,
89-
"symbol": "Unknown",
90-
"name": "Unknown",
91-
"logo": "https://imagedelivery.net/lPzngbR8EltRfBOi_WYaXw/63a231c0-d1c3-4901-1e28-7c4410dfaa00/public",
92-
"coinGeckoId": "",
93-
"denom": "peggy0x44C21afAaF20c270EBbF5914Cfc3b5022173FEB7",
94-
"tokenType": "erc20",
95-
"externalLogo": "unknown.png"
96-
},
9784
"factory/inj17gkuet8f6pssxd8nycm3qr9d9y699rupv6397z/uzen": {
9885
"decimals": 0,
9986
"symbol": "ZEN",

‎json/helix/trading/derivativeMap/mainnet.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"sbet-usdt-perp": "0xa64335c69ee025897d00880752971320c8bf35fa7346c58cd208bb8e996e95e3",
23
"pump-usdt-perp": "0x2a01aab6359dd0e801716f385a74d17e0dd754c3d24238604ed7d549ddefd611",
34
"wti-usdt-perp": "0x12ea31cc591984150dd2341f593c0bd3e57e3e057e8bd692806b7ac092ac529c",
45
"launchcoin-usdt-perp": "0x99fb44dc75753727f89bad0e79b8b9d2a69ab3cf62730ac405cfd3611569dbc0",

‎json/helix/trading/derivativeMap/staging.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"sbet-usdt-perp": "0xa64335c69ee025897d00880752971320c8bf35fa7346c58cd208bb8e996e95e3",
23
"pump-usdt-perp": "0x2a01aab6359dd0e801716f385a74d17e0dd754c3d24238604ed7d549ddefd611",
34
"wti-usdt-perp": "0x12ea31cc591984150dd2341f593c0bd3e57e3e057e8bd692806b7ac092ac529c",
45
"launchcoin-usdt-perp": "0x99fb44dc75753727f89bad0e79b8b9d2a69ab3cf62730ac405cfd3611569dbc0",

‎json/helix/trading/market/categoryMap/mainnet.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
{
22
"newMarkets": [
3+
{
4+
"slug": "sbet-usdt-perp",
5+
"marketId": "0xa64335c69ee025897d00880752971320c8bf35fa7346c58cd208bb8e996e95e3"
6+
},
37
{
48
"slug": "pump-usdt-perp",
59
"marketId": "0x2a01aab6359dd0e801716f385a74d17e0dd754c3d24238604ed7d549ddefd611"
@@ -132,6 +136,10 @@
132136
}
133137
],
134138
"iAssets": [
139+
{
140+
"slug": "sbet-usdt-perp",
141+
"marketId": "0xa64335c69ee025897d00880752971320c8bf35fa7346c58cd208bb8e996e95e3"
142+
},
135143
{
136144
"slug": "wti-usdt-perp",
137145
"marketId": "0x12ea31cc591984150dd2341f593c0bd3e57e3e057e8bd692806b7ac092ac529c"
@@ -215,6 +223,10 @@
215223
],
216224
"deprecated": [],
217225
"trending": [
226+
{
227+
"slug": "sbet-usdt-perp",
228+
"marketId": "0xa64335c69ee025897d00880752971320c8bf35fa7346c58cd208bb8e996e95e3"
229+
},
218230
{
219231
"slug": "pump-usdt-perp",
220232
"marketId": "0x2a01aab6359dd0e801716f385a74d17e0dd754c3d24238604ed7d549ddefd611"

0 commit comments

Comments
 (0)