Skip to content

Commit 048d0fd

Browse files
GabrielePiccoGabrielePicco
authored
🐛 Fix WebGL web request (#23)
* 🐛 Fix WebGL web request * ⚡ Find whirlpool return poll with liquidity more than 0 * 💚 Ignore tests with no liquidity pools * 💚 Fix CI
1 parent f14538a commit 048d0fd

File tree

11 files changed

+76
-57
lines changed

11 files changed

+76
-57
lines changed

‎src/Solana.Unity.Dex/Orca/Orca/OrcaDex.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ public override async Task<Tuple<PublicKey, Whirlpool>> FindWhirlpool(
652652
await Task.WhenAll(promises);
653653
foreach(var p in promises)
654654
{
655-
if (p.Result != null && p.Result.Item2 != null)
655+
if (p.Result != null && p.Result.Item2 != null && p.Result.Item2.Liquidity > 0)
656656
{
657657
result = p.Result;
658658
break;

‎src/Solana.Unity.Dex/Orca/Orca/OrcaTokens.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ public static async Task<IList<TokenData>> GetTokens(Cluster cluster = Cluster.M
4141
{
4242
using var client = new HttpClient();
4343
using var httpReq = new HttpRequestMessage(HttpMethod.Get, url);
44-
string response = await CrossHttpClient.SendAsyncRequest(client, httpReq).Result.Content.ReadAsStringAsync();
44+
HttpResponseMessage result = await CrossHttpClient.SendAsyncRequest(client, httpReq);
45+
string response = await result.Content.ReadAsStringAsync();
4546
TokensDocument tokensDocument = new JsonSerializer().Deserialize<TokensDocument>(
4647
new JsonTextReader(
4748
new StringReader(response)

‎src/Solana.Unity.Dex/Orca/Quotes/Swap/SwapQuoteUtils.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,11 @@ PublicKey programId
127127
)
128128
{
129129
TokenType swapTokenType = PoolUtils.GetTokenType(whirlpool, inputTokenMint);
130-
System.Diagnostics.Debug.Assert(swapTokenType != TokenType.None, "swapTokenMint does not match any tokens on this pool");
130+
if(swapTokenType == TokenType.None)
131+
throw new WhirlpoolsException(
132+
"swapTokenMint does not match any tokens on this pool",
133+
SwapErrorCode.SqrtPriceOutOfBounds
134+
);
131135
bool aToB = swapTokenType == amountSpecifiedTokenType;
132136

133137
IList<TickArrayContainer> tickArrays = await SwapUtils.GetTickArrays(

‎src/Solana.Unity.Dex/Orca/Ticks/TickArraySequence.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ public IList<PublicKey> GetTouchedArrays(int minArraySize)
155155
/// <returns>True if the given index is in bounds of the array.</returns>
156156
private bool IsArrayIndexInBounds(TickArrayIndex index, bool aToB)
157157
{
158-
long localArrayIndex = this.GetLocalArrayIndex(index.ArrayIndex, aToB);
159-
int seqLength = this._tickArrays.Count;
158+
long localArrayIndex = GetLocalArrayIndex(index.ArrayIndex, aToB);
159+
int seqLength = _tickArrays.Count;
160160
return localArrayIndex >= 0 && localArrayIndex < seqLength;
161161
}
162162

‎src/Solana.Unity.Dex/Orca/Ticks/TickUtils.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22

33
using Solana.Unity.Dex.Orca.Core.Accounts;
4+
using Solana.Unity.Dex.Orca.Exceptions;
45

56
namespace Solana.Unity.Dex.Orca.Ticks
67
{
@@ -13,8 +14,10 @@ public static int GetStartTickIndex(int tickIndex, ushort tickSpacing, int offse
1314

1415
int ticksInArray = TickConstants.TICK_ARRAY_SIZE * tickSpacing;
1516
int minTickIndex = TickConstants.MIN_TICK_INDEX - ((TickConstants.MIN_TICK_INDEX % ticksInArray) + ticksInArray);
16-
System.Diagnostics.Debug.Assert(startTickIndex >= minTickIndex, $"startTickIndex (${startTickIndex}) >= minTickIndex ({minTickIndex})");
17-
System.Diagnostics.Debug.Assert(startTickIndex <= TickConstants.MAX_TICK_INDEX, $"startTickIndex (${startTickIndex}) <= TickConstants.MAX_TICK_INDEX ({TickConstants.MAX_TICK_INDEX})");
17+
if (startTickIndex < minTickIndex)
18+
throw new WhirlpoolsException($"startTickIndex (${startTickIndex}) >= minTickIndex ({minTickIndex})");
19+
if (startTickIndex > TickConstants.MAX_TICK_INDEX)
20+
throw new WhirlpoolsException($"startTickIndex (${startTickIndex}) <= TickConstants.MAX_TICK_INDEX ({TickConstants.MAX_TICK_INDEX})");
1821
return (int)startTickIndex;
1922
}
2023

‎src/Solana.Unity.Extensions/TokenMintResolver.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static TokenMintResolver Load()
6464
}
6565

6666
/// <summary>
67-
/// Return an instance of the TokenMintResolver loaded dererialised token list JSON from the specified URL.
67+
/// Return an instance of the TokenMintResolver loaded deserialised token list JSON from the specified URL.
6868
/// </summary>
6969
/// <param name="url"></param>
7070
/// <returns>An instance of the TokenMintResolver populated with Solana token list definitions.</returns>
@@ -91,7 +91,12 @@ public static async Task<TokenMintResolver> LoadAsync(string url)
9191
using (var client = new HttpClient())
9292
{
9393
using var httpReq = new HttpRequestMessage(HttpMethod.Get, url);
94-
string json = await CrossHttpClient.SendAsyncRequest(client, httpReq).Result.Content.ReadAsStringAsync();
94+
var httpResp = await CrossHttpClient.SendAsyncRequest(client, httpReq);
95+
string json = null;
96+
if (httpResp.IsSuccessStatusCode && httpResp.Content != null)
97+
{
98+
json = await httpResp.Content.ReadAsStringAsync();
99+
}
95100
return ParseTokenList(json);
96101
}
97102
}

‎src/Solana.Unity.Rpc/Core/Http/CrossHttpClient.cs

Lines changed: 41 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using Solana.Unity.Rpc.Utilities;
22
using System;
3-
using System.Collections;
43
using System.Net;
54
using System.Net.Http;
65
using System.Text;
6+
using System.Threading;
77
using System.Threading.Tasks;
88
using UnityEngine.Networking;
99

@@ -14,6 +14,8 @@ namespace Solana.Unity.Rpc.Core.Http;
1414
/// </summary>
1515
public static class CrossHttpClient
1616
{
17+
private static TaskCompletionSource<UnityWebRequest.Result> _currentRequestTask;
18+
1719
/// <summary>
1820
/// Send an async request using HttpClient or UnityWebRequest if running on Unity
1921
/// </summary>
@@ -29,6 +31,8 @@ public static async Task<HttpResponseMessage> SendAsyncRequest(HttpClient httpCl
2931
}
3032
return await httpClient.SendAsync(httpReq).ConfigureAwait(false);
3133
}
34+
35+
3236

3337
/// <summary>
3438
/// Convert a httReq to a Unity Web request
@@ -39,42 +43,48 @@ public static async Task<HttpResponseMessage> SendAsyncRequest(HttpClient httpCl
3943
/// <exception cref="HttpRequestException"></exception>
4044
private static async Task<HttpResponseMessage> SendUnityWebRequest(Uri uri, HttpRequestMessage httpReq)
4145
{
42-
using (var request = new UnityWebRequest(uri, httpReq.Method.ToString()))
46+
using UnityWebRequest request = new(uri, httpReq.Method.ToString());
47+
if (httpReq.Content != null)
4348
{
44-
if (httpReq.Content != null)
45-
{
46-
request.uploadHandler = new UploadHandlerRaw(await httpReq.Content.ReadAsByteArrayAsync());
47-
request.SetRequestHeader("Content-Type", "application/json");
48-
}
49-
request.downloadHandler = new DownloadHandlerBuffer();
50-
var response = new HttpResponseMessage();
51-
var e = SendRequest(request, response);
52-
while (e.MoveNext()) { }
53-
if (request.result == UnityWebRequest.Result.ConnectionError)
54-
{
55-
throw new HttpRequestException("Error While Sending: " + request.error);
56-
}
57-
return response;
49+
request.uploadHandler = new UploadHandlerRaw(await httpReq.Content.ReadAsByteArrayAsync());
50+
request.SetRequestHeader("Content-Type", "application/json");
51+
}
52+
request.downloadHandler = new DownloadHandlerBuffer();
53+
if (_currentRequestTask != null)
54+
{
55+
await _currentRequestTask.Task;
56+
}
57+
UnityWebRequest.Result result = await SendRequest(request);
58+
HttpResponseMessage response = new();
59+
if (result == UnityWebRequest.Result.Success)
60+
{
61+
response.StatusCode = HttpStatusCode.OK;
62+
response.Content = new ByteArrayContent(Encoding.UTF8.GetBytes(request.downloadHandler.text));
63+
}
64+
else
65+
{
66+
response.StatusCode = HttpStatusCode.ExpectationFailed;
5867
}
68+
return response;
5969
}
6070

61-
/// <summary>
62-
/// Send a request using UnityWebRequest and wait for the response
63-
/// </summary>
64-
/// <param name="request"></param>
65-
/// <param name="res"></param>
66-
/// <returns></returns>
67-
/// <exception cref="HttpRequestException"></exception>
68-
private static IEnumerator SendRequest(UnityWebRequest request, HttpResponseMessage res)
71+
private static Task<UnityWebRequest.Result> SendRequest(UnityWebRequest request)
6972
{
70-
yield return request.SendWebRequest();
71-
while (!request.isDone)
72-
yield return true;
73-
if (request.result == UnityWebRequest.Result.ConnectionError)
73+
TaskCompletionSource<UnityWebRequest.Result> sendRequestTask = new();
74+
_currentRequestTask = sendRequestTask;
75+
UnityWebRequestAsyncOperation op = request.SendWebRequest();
76+
77+
if (request.isDone)
78+
{
79+
sendRequestTask.SetResult(request.result);
80+
}
81+
else
7482
{
75-
throw new HttpRequestException("Error While Sending: " + request.error);
83+
op.completed += asyncOp =>
84+
{
85+
sendRequestTask.SetResult(((UnityWebRequestAsyncOperation)asyncOp).webRequest.result);
86+
};
7687
}
77-
res.StatusCode = HttpStatusCode.OK;
78-
res.Content = new ByteArrayContent(Encoding.UTF8.GetBytes(request.downloadHandler.text));
88+
return sendRequestTask.Task;
7989
}
8090
}

‎src/Solana.Unity.Rpc/Utilities/RuntimePlatforms.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ public static bool IsWebGL()
3939
{
4040
return false;
4141
}
42-
return GetRuntimePlatform() == WebGLPlayer;
42+
string platform = GetRuntimePlatform();
43+
return platform == WebGLPlayer || string.IsNullOrEmpty(platform);
4344
}
4445

4546
/// <summary>

‎test/Solana.Unity.Dex.Test/Orca/Integration/TxApi/FindWhirlpoolTests.cs

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,11 @@
22
using Orca;
33
using System;
44
using System.Linq;
5-
using System.Numerics;
65
using System.Threading.Tasks;
76
using System.Collections.Generic;
87

98
using Solana.Unity.Wallet;
10-
using Solana.Unity.Rpc.Models;
119
using Solana.Unity.Rpc.Types;
12-
using Solana.Unity.Programs.Models;
13-
14-
using Solana.Unity.Dex.Orca;
15-
using Solana.Unity.Dex.Orca.Math;
16-
using Solana.Unity.Dex.Orca.SolanaApi;
17-
using Solana.Unity.Dex.Orca.Ticks;
18-
using Solana.Unity.Dex.Orca.Quotes.Swap;
19-
using Solana.Unity.Dex.Orca.Core.Accounts;
20-
using Solana.Unity.Dex.Test.Orca.Params;
2110
using Solana.Unity.Dex.Orca.Address;
2211
using Solana.Unity.Dex.Test.Orca.Utils;
2312
using Solana.Unity.Dex.Ticks;
@@ -94,7 +83,7 @@ private static async Task<List<WhirlpoolMiniData>> CreateABunchOfPools(int numPo
9483

9584
[Test]
9685
[Description("finds whirlpool with tokens specified in correct order, with correct tickspacing")]
97-
public static async Task Find_WhirlpoolsCorrectOrderCorrectTickSpacing()
86+
public static async Task FindWhirlpoolsCorrectOrderCorrectTickSpacing()
9887
{
9988
OrcaDex dex = new OrcaDex(_context);
10089

@@ -114,7 +103,7 @@ public static async Task Find_WhirlpoolsCorrectOrderCorrectTickSpacing()
114103

115104
[Test]
116105
[Description("finds whirlpool with tokens specified in correct order, with correct tickspacing")]
117-
public static async Task Find_WhirlpoolsAddressCorrectOrderCorrectTickSpacing()
106+
public static async Task FindWhirlpoolsAddressCorrectOrderCorrectTickSpacing()
118107
{
119108
IDex dex = new OrcaDex(_context);
120109

@@ -129,6 +118,7 @@ public static async Task Find_WhirlpoolsAddressCorrectOrderCorrectTickSpacing()
129118
}
130119

131120
[Test]
121+
[Ignore("Ignore no liquidity poll")]
132122
[Description("finds whirlpool with tokens specified in correct order, with wrong tickspacing")]
133123
public static async Task FindWhirlpoolsCorrectOrderWrongTickSpacing()
134124
{
@@ -169,6 +159,7 @@ public static async Task FindWhirlpoolsWrongOrderCorrectTickSpacing()
169159
}
170160

171161
[Test]
162+
[Ignore("Ignore no liquidity poll")]
172163
[Description("finds whirlpool with tokens specified in wrong order, with wrong tickspacing")]
173164
public static async Task FindWhirlpoolsWrongOrderWrongTickSpacing()
174165
{

‎test/Solana.Unity.Dex.Test/Orca/Integration/UpdateFeesRewardsTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using Solana.Unity.Dex.Test.Orca.Utils;
1414
using Solana.Unity.Dex.Ticks;
1515
using Solana.Unity.Rpc.Types;
16+
using System;
1617
using BigDecimal = Solana.Unity.Dex.Orca.Math.BigDecimal;
1718

1819
namespace Solana.Unity.Dex.Test.Orca.Integration
@@ -107,6 +108,7 @@ await _context.WhirlpoolClient.GetPositionAsync(position.PublicKey, _defaultComm
107108

108109
Assert.IsTrue(updateResult.WasSuccessful);
109110
Assert.IsTrue(await _context.RpcClient.ConfirmTransaction(updateResult.Result, _defaultCommitment));
111+
await Task.Delay(TimeSpan.FromSeconds(10));
110112

111113
//get position after
112114
Position positionAfter = (

‎test/Solana.Unity.Dex.Test/Orca/Utils/PoolTestUtils.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,8 @@ public static async Task<PoolInitWithLiquidityResult> BuildPoolWithLiquidity(
234234
BigInteger? initSqrtPrice = null,
235235
BigInteger? mintAmount = null,
236236
bool tokenAIsNative = false,
237-
bool aToB = false
237+
bool aToB = false,
238+
bool skipInitConfig = false
238239
)
239240
{
240241
if (initConfigParams == null)
@@ -248,8 +249,9 @@ public static async Task<PoolInitWithLiquidityResult> BuildPoolWithLiquidity(
248249
tickSpacing,
249250
defaultFeeRate,
250251
initSqrtPrice,
251-
mintAmount,
252-
tokenAIsNative
252+
mintAmount,
253+
tokenAIsNative,
254+
skipInitConfig
253255
);
254256

255257
IList<Pda> tickArrays = await TickArrayTestUtils.InitializeTickArrayRangeAsync(

0 commit comments

Comments
 (0)