Skip to content

Commit ddf00f0

Browse files
xactantxactant
committed
Merge User Save Fix
1 parent c47dfbd commit ddf00f0

35 files changed

+462
-191
lines changed

‎Assets/MoralisWeb3ApiSdk/Example/Scripts/MainMenuScript.cs

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,12 @@
4343
using Moralis.WebGL;
4444
using Moralis.WebGL.Platform;
4545
using Moralis.WebGL.Platform.Objects;
46+
using Moralis.WebGL.Web3Api.Models;
4647
#else
4748
using System.Threading.Tasks;
4849
using Moralis.Platform;
4950
using Moralis.Platform.Objects;
51+
using Moralis.Web3Api.Models;
5052
#endif
5153

5254
/// <summary>
@@ -77,14 +79,6 @@ async void Start()
7779
{
7880
menuBackground = (Image)gameObject.GetComponent(typeof(Image));
7981

80-
//HostManifestData hostManifestData = new HostManifestData()
81-
//{
82-
// Version = Version,
83-
// Identifier = ApplicationName,
84-
// Name = ApplicationName,
85-
// ShortVersion = Version
86-
//};
87-
8882
qrMenu.SetActive(false);
8983
androidMenu.SetActive(false);
9084
iosMenu.SetActive(false);
@@ -119,17 +113,12 @@ async void Start()
119113
/// </summary>
120114
public async void Play()
121115
{
122-
Debug.Log("PLAY");
123-
124116
AuthenticationButtonOff();
125117

126118
// If the user is still logged in just show game.
127119
if (MoralisInterface.IsLoggedIn())
128120
{
129121
Debug.Log("User is already logged in to Moralis.");
130-
131-
// Transition to main game scene
132-
//SceneManager.LoadScene(SceneMap.GAME_VIEW);
133122
}
134123
// User is not logged in, depending on build target, begin wallect connection.
135124
else
@@ -142,14 +131,14 @@ public async void Play()
142131
// code below is on purpose just to keep the iOS and Android authentication
143132
// processes separate.
144133
#if UNITY_ANDROID
145-
// By pass noraml Wallet Connect for now.
134+
// Use Wallet Connect for now.
146135
androidMenu.SetActive(true);
147136

148137
// Use Moralis Connect page for authentication as we work to make the Wallet
149138
// Connect experience better.
150139
//await LoginViaConnectionPage();
151140
#elif UNITY_IOS
152-
// By pass noraml Wallet Connect for now.
141+
// Use Wallet Connect for now.
153142
iosMenu.SetActive(true);
154143

155144
// Use Moralis Connect page for authentication as we work to make the Wallet
@@ -306,25 +295,7 @@ public void HideWalletSelection()
306295
/// <summary>
307296
/// Display Moralis connector login page
308297
/// </summary>
309-
#if UNITY_WEBGL
310-
private async UniTask LoginViaConnectionPage()
311-
{
312-
// Use Moralis Connect page for authentication as we work to make the Wallet
313-
// Connect experience better.
314-
MoralisUser user = await MobileLogin.LogIn(moralisController.MoralisServerURI, moralisController.MoralisApplicationId);
315-
316-
if (user != null)
317-
{
318-
// User is not null so login was successful, show first game scene.
319-
//SceneManager.LoadScene(SceneMap.GAME_VIEW);
320-
AuthenticationButtonOff();
321-
}
322-
else
323-
{
324-
AuthenticationButtonOn();
325-
}
326-
}
327-
#else
298+
#if !UNITY_WEBGL
328299
private async Task LoginViaConnectionPage()
329300
{
330301
// Use Moralis Connect page for authentication as we work to make the Wallet

‎Assets/MoralisWeb3ApiSdk/Moralis/Moralis.Web3Api/Api/AccountApi.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public async Task<TransactionCollection> GetTransactions (string address, ChainL
133133
var path = "/{address}";
134134
path = path.Replace("{format}", "json");
135135
path = path.Replace("{" + "address" + "}", ApiClient.ParameterToString(address));
136-
if(chain != null) queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
136+
queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
137137
if(subdomain != null) queryParams.Add("subdomain", ApiClient.ParameterToString(subdomain));
138138
if(fromBlock != null) queryParams.Add("from_block", ApiClient.ParameterToString(fromBlock));
139139
if(toBlock != null) queryParams.Add("to_block", ApiClient.ParameterToString(toBlock));
@@ -179,7 +179,7 @@ public async Task<NativeBalance> GetNativeBalance (string address, ChainList cha
179179
var path = "/{address}/balance";
180180
path = path.Replace("{format}", "json");
181181
path = path.Replace("{" + "address" + "}", ApiClient.ParameterToString(address));
182-
if(chain != null) queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
182+
queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
183183
if(providerUrl != null) queryParams.Add("providerUrl", ApiClient.ParameterToString(providerUrl));
184184
if(toBlock != null) queryParams.Add("to_block", ApiClient.ParameterToString(toBlock));
185185

@@ -221,7 +221,7 @@ public async Task<List<Erc20TokenBalance>> GetTokenBalances (string address, Cha
221221
var path = "/{address}/erc20";
222222
path = path.Replace("{format}", "json");
223223
path = path.Replace("{" + "address" + "}", ApiClient.ParameterToString(address));
224-
if(chain != null) queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
224+
queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
225225
if(subdomain != null) queryParams.Add("subdomain", ApiClient.ParameterToString(subdomain));
226226
if(toBlock != null) queryParams.Add("to_block", ApiClient.ParameterToString(toBlock));
227227
if(tokenAddresses != null) queryParams.Add("token_addresses", ApiClient.ParameterToString(tokenAddresses));
@@ -280,7 +280,7 @@ public async Task<Erc20TransactionCollection> GetTokenTransfers (string address,
280280
var path = "/{address}/erc20/transfers";
281281
path = path.Replace("{format}", "json");
282282
path = path.Replace("{" + "address" + "}", ApiClient.ParameterToString(address));
283-
if(chain != null) queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
283+
queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
284284
if(subdomain != null) queryParams.Add("subdomain", ApiClient.ParameterToString(subdomain));
285285
if(fromBlock != null) queryParams.Add("from_block", ApiClient.ParameterToString(fromBlock));
286286
if(toBlock != null) queryParams.Add("to_block", ApiClient.ParameterToString(toBlock));
@@ -333,7 +333,7 @@ public async Task<NftOwnerCollection> GetNFTs (string address, ChainList chain,
333333
var path = "/{address}/nft";
334334
path = path.Replace("{format}", "json");
335335
path = path.Replace("{" + "address" + "}", ApiClient.ParameterToString(address));
336-
if(chain != null) queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
336+
queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
337337
if(format != null) queryParams.Add("format", ApiClient.ParameterToString(format));
338338
if(offset != null) queryParams.Add("offset", ApiClient.ParameterToString(offset));
339339
if(limit != null) queryParams.Add("limit", ApiClient.ParameterToString(limit));
@@ -380,7 +380,7 @@ public async Task<NftTransferCollection> GetNFTTransfers (string address, ChainL
380380
var path = "/{address}/nft/transfers";
381381
path = path.Replace("{format}", "json");
382382
path = path.Replace("{" + "address" + "}", ApiClient.ParameterToString(address));
383-
if(chain != null) queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
383+
queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
384384
if(format != null) queryParams.Add("format", ApiClient.ParameterToString(format));
385385
if(direction != null) queryParams.Add("direction", ApiClient.ParameterToString(direction));
386386
if(offset != null) queryParams.Add("offset", ApiClient.ParameterToString(offset));
@@ -433,7 +433,7 @@ public async Task<NftOwnerCollection> GetNFTsForContract (string address, string
433433
var path = "/{address}/nft/{token_address}";
434434
path = path.Replace("{format}", "json");
435435
path = path.Replace("{" + "address" + "}", ApiClient.ParameterToString(address)); path = path.Replace("{" + "token_address" + "}", ApiClient.ParameterToString(tokenAddress));
436-
if(chain != null) queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
436+
queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
437437
if(format != null) queryParams.Add("format", ApiClient.ParameterToString(format));
438438
if(offset != null) queryParams.Add("offset", ApiClient.ParameterToString(offset));
439439
if(limit != null) queryParams.Add("limit", ApiClient.ParameterToString(limit));

‎Assets/MoralisWeb3ApiSdk/Moralis/Moralis.Web3Api/Api/DefiApi.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public async Task<ReservesCollection> GetPairReserves (string pairAddress, Chain
120120
var path = "/{pair_address}/reserves";
121121
path = path.Replace("{format}", "json");
122122
path = path.Replace("{" + "pair_address" + "}", ApiClient.ParameterToString(pairAddress));
123-
if(chain != null) queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
123+
queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
124124
if(toBlock != null) queryParams.Add("to_block", ApiClient.ParameterToString(toBlock));
125125
if(toDate != null) queryParams.Add("to_date", ApiClient.ParameterToString(toDate));
126126
if(providerUrl != null) queryParams.Add("provider_url", ApiClient.ParameterToString(providerUrl));
@@ -176,7 +176,7 @@ public async Task<ReservesCollection> GetPairAddress (string exchange, string to
176176
path = path.Replace("{format}", "json");
177177
path = path.Replace("{" + "token0_address" + "}", ApiClient.ParameterToString(token0Address)); path = path.Replace("{" + "token1_address" + "}", ApiClient.ParameterToString(token1Address));
178178
if(exchange != null) queryParams.Add("exchange", ApiClient.ParameterToString(exchange));
179-
if(chain != null) queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
179+
queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
180180
if(toBlock != null) queryParams.Add("to_block", ApiClient.ParameterToString(toBlock));
181181
if(toDate != null) queryParams.Add("to_date", ApiClient.ParameterToString(toDate));
182182

‎Assets/MoralisWeb3ApiSdk/Moralis/Moralis.Web3Api/Api/NativeApi.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public async Task<Block> GetBlock (string blockNumberOrHash, ChainList chain, st
115115
var path = "/block/{block_number_or_hash}";
116116
path = path.Replace("{format}", "json");
117117
path = path.Replace("{" + "block_number_or_hash" + "}", ApiClient.ParameterToString(blockNumberOrHash));
118-
if(chain != null) queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
118+
queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
119119
if(subdomain != null) queryParams.Add("subdomain", ApiClient.ParameterToString(subdomain));
120120

121121
// Authentication setting, if any
@@ -155,7 +155,7 @@ public async Task<BlockDate> GetDateToBlock (string date, ChainList chain, strin
155155
path = path.Replace("{format}", "json");
156156

157157
if(date != null) queryParams.Add("date", ApiClient.ParameterToString(date));
158-
if(chain != null) queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
158+
queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
159159
if(providerUrl != null) queryParams.Add("providerUrl", ApiClient.ParameterToString(providerUrl));
160160

161161
// Authentication setting, if any
@@ -220,7 +220,7 @@ public async Task<LogEventByAddress> GetLogsByAddress (string address, ChainList
220220
var path = "/{address}/logs";
221221
path = path.Replace("{format}", "json");
222222
path = path.Replace("{" + "address" + "}", ApiClient.ParameterToString(address));
223-
if(chain != null) queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
223+
queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
224224
if(subdomain != null) queryParams.Add("subdomain", ApiClient.ParameterToString(subdomain));
225225
if(blockNumber != null) queryParams.Add("block_number", ApiClient.ParameterToString(blockNumber));
226226
if(fromBlock != null) queryParams.Add("from_block", ApiClient.ParameterToString(fromBlock));
@@ -272,7 +272,7 @@ public async Task<NftTransferCollection> GetNFTTransfersByBlock (string blockNum
272272
var path = "/block/{block_number_or_hash}/nft/transfers";
273273
path = path.Replace("{format}", "json");
274274
path = path.Replace("{" + "block_number_or_hash" + "}", ApiClient.ParameterToString(blockNumberOrHash));
275-
if(chain != null) queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
275+
queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
276276
if(subdomain != null) queryParams.Add("subdomain", ApiClient.ParameterToString(subdomain));
277277
if(offset != null) queryParams.Add("offset", ApiClient.ParameterToString(offset));
278278
if(limit != null) queryParams.Add("limit", ApiClient.ParameterToString(limit));
@@ -314,7 +314,7 @@ public async Task<BlockTransaction> GetTransaction (string transactionHash, Chai
314314
var path = "/transaction/{transaction_hash}";
315315
path = path.Replace("{format}", "json");
316316
path = path.Replace("{" + "transaction_hash" + "}", ApiClient.ParameterToString(transactionHash));
317-
if(chain != null) queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
317+
queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
318318
if(subdomain != null) queryParams.Add("subdomain", ApiClient.ParameterToString(subdomain));
319319

320320
// Authentication setting, if any
@@ -381,7 +381,7 @@ public async Task<List<LogEvent>> GetContractEvents (string address, string topi
381381
path = path.Replace("{format}", "json");
382382
path = path.Replace("{" + "address" + "}", ApiClient.ParameterToString(address));
383383
if (topic != null) queryParams.Add("topic", ApiClient.ParameterToString(topic));
384-
if(chain != null) queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
384+
queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
385385
if(subdomain != null) queryParams.Add("subdomain", ApiClient.ParameterToString(subdomain));
386386
if(providerUrl != null) queryParams.Add("providerUrl", ApiClient.ParameterToString(providerUrl));
387387
if(fromBlock != null) queryParams.Add("from_block", ApiClient.ParameterToString(fromBlock));
@@ -441,7 +441,7 @@ public async Task<string> RunContractFunction (string address, string functionNa
441441
if (abi != null) postBody.Add("abi", abi.Abi);
442442
if (abi != null) postBody.Add("params", abi.Params);
443443
if (functionName != null) queryParams.Add("function_name", ApiClient.ParameterToString(functionName));
444-
if(chain != null) queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
444+
queryParams.Add("chain", ApiClient.ParameterToHex((long)chain));
445445
if(subdomain != null) queryParams.Add("subdomain", ApiClient.ParameterToString(subdomain));
446446
if(providerUrl != null) queryParams.Add("providerUrl", ApiClient.ParameterToString(providerUrl));
447447

0 commit comments

Comments
 (0)