这是indexloc提供的服务，不要输入任何密码
Skip to content

Marketplace ux improvement #1105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Aug 26, 2024
Merged

Marketplace ux improvement #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
400c04e
Marketplace prefab ux improvements
sneakzttv Aug 20, 2024
9620fd3
Fixes
sneakzttv Aug 22, 2024
976f5af
Fixes
sneakzttv Aug 22, 2024
f80d7f8
Update MintCollectionNftManager.cs
sneakzttv Aug 22, 2024
7425858
Update BrowseCollectionManager.cs
sneakzttv Aug 22, 2024
d5532c3
Update BrowseCollectionManager.cs
sneakzttv Aug 22, 2024
39cc895
Update BrowseCollectionManager.cs
sneakzttv Aug 22, 2024
f610dd7
fixes
sneakzttv Aug 22, 2024
3ef43fd
Update MintCollectionNftManager.cs
sneakzttv Aug 22, 2024
8582a81
Update BrowseCollectionManager.cs
sneakzttv Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions Packages/io.chainsafe.web3-unity.marketplace/Runtime/Scripts/Marketplace/Marketplace.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,21 +279,31 @@ public static async Task<TransactionReceipt> Mint721CollectionNft(string _bearer
var path = "/nft?hash=blake2b-208";
var collectionResponse = await CSServer.CreateData(_bearerToken, path, formData);
var collectionData = JsonConvert.DeserializeObject<ApiResponse>(collectionResponse);
Debug.Log($"CID: {collectionData.cid}");
Copy link
Collaborator

@rob1997 rob1997 Aug 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can remove this debug

var method = "mint";
object[] args =
{
Web3Accessor.Web3.Signer.PublicAddress,
collectionData.cid
};
var contract = Web3Accessor.Web3.ContractBuilder.Build(ABI.GeneralErc721, _collectionContract);
var data = await contract.SendWithReceipt(method, args);
var txArgs = new TransactionRequest
{
GasLimit = new HexBigInteger(90000)
};
var data = await contract.SendWithReceipt(method, args, txArgs);
return data.receipt;
}
catch (Web3Exception e)
Copy link
Collaborator

@rob1997 rob1997 Aug 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can replace this with

catch (Exception e)
{
if (!(e is Web3Exception))
{
Debug.LogError("Error: " + e.Message);
}
throw e;
}

{
Console.WriteLine(e);
throw;
}
catch (Exception e)
{
Debug.LogError("Error: " + e.Message);
throw;
}
}

/// <summary>
Expand All @@ -319,13 +329,14 @@ public static async Task<TransactionReceipt> Mint1155CollectionNft(string _beare
};
if (!string.IsNullOrEmpty(_description))
{
formData.Insert(2, new MultipartFormDataSection("description", _description));
formData.Insert(1, new MultipartFormDataSection("description", _description));
}
var path = "/nft?hash=blake2b-208";
var collectionResponse = await CSServer.CreateData(_bearerToken, path, formData);
var collectionData = JsonConvert.DeserializeObject<ApiResponse>(collectionResponse);
var method = "mint";
var amount = BigInteger.Parse(_amount);
Debug.Log($"Amount3: {amount}");
Copy link
Collaborator

@rob1997 rob1997 Aug 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this debug can be removed

object[] args =
{
Web3Accessor.Web3.Signer.PublicAddress,
Expand All @@ -334,14 +345,23 @@ public static async Task<TransactionReceipt> Mint1155CollectionNft(string _beare
};

var contract = Web3Accessor.Web3.ContractBuilder.Build(ABI.GeneralErc1155, _collectionContract);
var data = await contract.SendWithReceipt(method, args);
var txArgs = new TransactionRequest
{
GasLimit = new HexBigInteger(90000)
};
var data = await contract.SendWithReceipt(method, args, txArgs);
return data.receipt;
}
catch (Web3Exception e)
Copy link
Collaborator

@rob1997 rob1997 Aug 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this can also be replaced with my suggestion above

{
Console.WriteLine(e);
throw;
}
catch (Exception e)
{
Debug.LogError("Error: " + e.Message);
throw;
}
}

/// <summary>
Expand Down Expand Up @@ -435,7 +455,7 @@ public static async Task<TransactionReceipt> SetApprovalMarketplace(string _nftC
_marketplaceContract,
_permission
};
var abi = _type == "721" ? Token.ABI.GeneralErc721 : Token.ABI.GeneralErc1155;
var abi = _type == "ERC721" ? Token.ABI.GeneralErc721 : Token.ABI.GeneralErc1155;
var contract = Web3Accessor.Web3.ContractBuilder.Build(abi, _nftContract);
var data = await contract.SendWithReceipt(method, args);
return data.receipt;
Expand Down
11 changes: 7 additions & 4 deletions Packages/io.chainsafe.web3-unity/Runtime/Scripts/EVM/Remote/CSServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using ChainSafe.Gaming.UnityPackage;
using ChainSafe.Gaming.Web3;
using Newtonsoft.Json;
using UnityEngine;
using UnityEngine.Networking;
Expand Down Expand Up @@ -75,7 +77,7 @@ public static async Task<string> DeleteData(string _bearerToken, string _path)
if (request.result != UnityWebRequest.Result.Success)
{
Debug.LogError($"Error deleting: {request.error}");
return request.error;
throw new Exception($"Error: {request.error}");
}
return "Deleted successfully";
}
Expand All @@ -93,16 +95,17 @@ public static async Task<string> CreateData(string _bearerToken, string _path,
var url = $"{host}{Web3Accessor.Web3.ProjectConfig.ProjectId}{_path}";
if (_path == "/nft?hash=blake2b-208")
{
url = "https://api.chainsafe.io/v1/nft?hash=blake2b-208";
url = "https://api.chainsafe.io/api/v1/nft?hash=blake2b-208";
}
using (UnityWebRequest request = UnityWebRequest.Post($"{url}", _formData))
{
request.SetRequestHeader("Authorization", $"Bearer {_bearerToken}");
request.SetRequestHeader("Accept", "application/json");
await request.SendWebRequest();
if (request.result != UnityWebRequest.Result.Success)
{
Debug.LogError("Creation failed: " + request.downloadHandler.text);
return request.error;
throw new Exception($"Error: {request.error}");
}
return request.downloadHandler.text;
}
Expand Down
Loading