Skip to content
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.

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

MUD Integration V2 #1078

Merged
merged 21 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public override Task Initialize()
{
return Task.CompletedTask;
}

public override Web3Builder ConfigureServices(Web3Builder web3Builder)
{
return web3Builder.Configure(services =>
Expand All @@ -27,7 +27,7 @@ public override Web3Builder ConfigureServices(Web3Builder web3Builder)
// RememberSession = rememberMeToggle.isOn || _storedSessionAvailable,
};
#if UNITY_WEBGL && !UNITY_EDITOR
services.UseHyperPlay<HyperPlayWebGLProvider>(config);
services.UseHyperPlay<HyperPlayWebGLProvider>(config);
#else
services.UseHyperPlay(config);
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace Scripts.EVM.Marketplace
public class Marketplace
{
#region Methods

/// <summary>
/// Gets profile marketplaces.
/// Path: https://api.gaming.chainsafe.io/v1/projects/{projectID}/marketplaces
Expand All @@ -31,7 +31,7 @@ public class Marketplace
var response = await CSServer.GetDataWithToken<MarketplaceModel.ProjectMarketplacesResponse>(path, bearerToken);
return response;
}

/// <summary>
/// Gets project collections.
/// Path: https://api.gaming.chainsafe.io/v1/projects/{projectID}/collections
Expand All @@ -44,7 +44,7 @@ public class Marketplace
var response = await CSServer.GetDataWithToken<NftTokenModel.ProjectCollectionsResponse>(path, bearerToken);
return response;
}

/// <summary>
/// Gets all items in a project.
/// Path: https://api.gaming.chainsafe.io/v1/projects/{projectID}/items
Expand Down Expand Up @@ -83,7 +83,7 @@ public class Marketplace
var response = await CSServer.GetData<MarketplaceModel.Item>(path);
return response;
}

/// <summary>
/// Gets all tokens in a project.
/// Path: https://api.gaming.chainsafe.io/v1/projects/{projectID}/tokens
Expand Down Expand Up @@ -150,7 +150,7 @@ public class Marketplace
var response = await CSServer.GetData<MarketplaceModel.MarketplaceItemsResponse>(path);
return response;
}

/// <summary>
/// Creates a 721 collection
/// /// Path https://api.gaming.chainsafe.io/v1/projects/8524f420-ecd1-4cfd-a651-706ade97cac7/collections
Expand All @@ -162,9 +162,9 @@ public class Marketplace
/// <returns>Contract send data object</returns>
public static async Task<TransactionReceipt> Create721Collection(string _bearerToken, string _name, string _description, bool _isMintingPublic)
{
var logoImageData = await UploadPlatforms.GetImageData();
var bannerImageData = await UploadPlatforms.GetImageData();
var formData = new List<IMultipartFormSection>
var logoImageData = await UploadPlatforms.GetImageData();
var bannerImageData = await UploadPlatforms.GetImageData();
var formData = new List<IMultipartFormSection>
{
new MultipartFormDataSection("name", _name),
new MultipartFormDataSection("description", _description),
Expand All @@ -177,24 +177,24 @@ public static async Task<TransactionReceipt> Create721Collection(string _bearerT
new MultipartFormDataSection("contractAddress", ChainSafeContracts.MarketplaceContracts[Web3Accessor.Web3.ChainConfig.ChainId]),
new MultipartFormDataSection("type", "erc721")
};
var path = "/collections";
var collectionResponse = await CSServer.CreateData(_bearerToken, path, formData);
var collectionData = JsonConvert.DeserializeObject<CollectionResponses.Collections>(collectionResponse);
var method = "create721Collection";
object[] args =
{
var path = "/collections";
var collectionResponse = await CSServer.CreateData(_bearerToken, path, formData);
var collectionData = JsonConvert.DeserializeObject<CollectionResponses.Collections>(collectionResponse);
var method = "create721Collection";
object[] args =
{
Web3Accessor.Web3.ProjectConfig.ProjectId,
collectionData.id,
_name,
collectionData.type,
collectionData.banner,
_isMintingPublic
};
var contract = Web3Accessor.Web3.ContractBuilder.Build(ABI.MarketplaceFactory, ChainSafeContracts.MarketplaceContracts[Web3Accessor.Web3.ChainConfig.ChainId]);
var data = await contract.SendWithReceipt(method, args);
return data.receipt;
var contract = Web3Accessor.Web3.ContractBuilder.Build(ABI.MarketplaceFactory, ChainSafeContracts.MarketplaceContracts[Web3Accessor.Web3.ChainConfig.ChainId]);
var data = await contract.SendWithReceipt(method, args);
return data.receipt;
}

/// <summary>
/// Creates a 1155 collection
/// Path https://api.gaming.chainsafe.io/v1/projects/8524f420-ecd1-4cfd-a651-706ade97cac7/collections/
Expand Down Expand Up @@ -235,7 +235,7 @@ public static async Task<TransactionReceipt> Create1155Collection(string _bearer
_isMintingPublic
};
var contract = Web3Accessor.Web3.ContractBuilder.Build(ABI.MarketplaceFactory, ChainSafeContracts.MarketplaceContracts[Web3Accessor.Web3.ChainConfig.ChainId]);
var data = await contract.SendWithReceipt(method, args);
var data = await contract.SendWithReceipt(method, args);
return data.receipt;
}
catch (Web3Exception e)
Expand All @@ -244,7 +244,7 @@ public static async Task<TransactionReceipt> Create1155Collection(string _bearer
throw;
}
}

/// <summary>
/// /// Mints a 721 collection nft to the collection
/// </summary>
Expand All @@ -262,7 +262,7 @@ public static async Task<TransactionReceipt> Mint721CollectionNft(string _collec
_uri
};
var contract = Web3Accessor.Web3.ContractBuilder.Build(ABI.GeneralErc721, _collectionContract);
var data = await contract.SendWithReceipt(method, args);
var data = await contract.SendWithReceipt(method, args);
return data.receipt;
}
catch (Web3Exception e)
Expand All @@ -271,7 +271,7 @@ public static async Task<TransactionReceipt> Mint721CollectionNft(string _collec
throw;
}
}

/// <summary>
/// Mints a 1155 collection nft to the collection
/// </summary>
Expand All @@ -291,9 +291,9 @@ public static async Task<TransactionReceipt> Mint1155CollectionNft(string _colle
_uri,
amount
};

var contract = Web3Accessor.Web3.ContractBuilder.Build(ABI.GeneralErc1155, _collectionContract);
var data = await contract.SendWithReceipt(method, args);
var data = await contract.SendWithReceipt(method, args);
return data.receipt;
}
catch (Web3Exception e)
Expand All @@ -302,7 +302,7 @@ public static async Task<TransactionReceipt> Mint1155CollectionNft(string _colle
throw;
}
}

/// <summary>
/// Deletes a collection that isn't on chain yet by ID
/// Path https://api.gaming.chainsafe.io/v1/projects/8524f420-ecd1-4cfd-a651-706ade97cac7/collections/e38e9465-fb9b-4316-8d1d-c77e81b50d6a
Expand All @@ -316,7 +316,7 @@ public static async Task<string> DeleteCollection(string _bearerToken, string _c
var response = await CSServer.DeleteData(_bearerToken, path);
return response;
}

/// <summary>
/// Creates a marketplace
/// Path: https://api.gaming.chainsafe.io/v1/projects/8524f420-ecd1-4cfd-a651-706ade97cac7/marketplaces
Expand Down Expand Up @@ -350,7 +350,7 @@ public static async Task<TransactionReceipt> CreateMarketplace(string _bearerTok
_whitelisting
};
var contract = Web3Accessor.Web3.ContractBuilder.Build(ABI.MarketplaceFactory, ChainSafeContracts.MarketplaceContracts[Web3Accessor.Web3.ChainConfig.ChainId]);
var data = await contract.SendWithReceipt(method, args);
var data = await contract.SendWithReceipt(method, args);
return data.receipt;
}
catch (Web3Exception e)
Expand All @@ -359,7 +359,7 @@ public static async Task<TransactionReceipt> CreateMarketplace(string _bearerTok
throw;
}
}

/// <summary>
/// Deletes a marketplace that isn't on chain yet by ID
/// Path: https://api.gaming.chainsafe.io/v1/projects/8524f420-ecd1-4cfd-a651-706ade97cac7/marketplaces/{marketplaceId}
Expand All @@ -373,7 +373,7 @@ public static async Task<string> DeleteMarketplace(string _bearerToken, string _
var response = await CSServer.DeleteData(_bearerToken, path);
return response;
}

/// <summary>
/// Approves the marketplace to list 721 Nfts
/// </summary>
Expand All @@ -393,7 +393,7 @@ public static async Task<TransactionReceipt> SetApprovalMarketplace(string _nftC
};
var abi = _type == "721" ? Token.ABI.GeneralErc721 : Token.ABI.GeneralErc1155;
var contract = Web3Accessor.Web3.ContractBuilder.Build(abi, _nftContract);
var data = await contract.SendWithReceipt(method, args);
var data = await contract.SendWithReceipt(method, args);
return data.receipt;
}
catch (Web3Exception e)
Expand All @@ -402,7 +402,7 @@ public static async Task<TransactionReceipt> SetApprovalMarketplace(string _nftC
throw;
}
}

/// <summary>
/// Purchases NFT from the marketplace
/// </summary>
Expand All @@ -425,7 +425,7 @@ public static async Task<TransactionReceipt> PurchaseNft(string _marketplaceCont
Value = new HexBigInteger(BigInteger.Parse(_amountToSend).ToString("X"))
};
var contract = Web3Accessor.Web3.ContractBuilder.Build(ABI.Marketplace, _marketplaceContract);
var data = await contract.SendWithReceipt(method, args, tx);
var data = await contract.SendWithReceipt(method, args, tx);
return data.receipt;
}
catch (Web3Exception e)
Expand All @@ -434,7 +434,7 @@ public static async Task<TransactionReceipt> PurchaseNft(string _marketplaceCont
throw;
}
}

/// <summary>
/// Lists Nfts to the marketplace
/// </summary>
Expand All @@ -459,7 +459,7 @@ public static async Task<TransactionReceipt> ListNftsToMarketplace(string _marke
deadline
};
var contract = Web3Accessor.Web3.ContractBuilder.Build(ABI.Marketplace, _marketplaceContract);
var data = await contract.SendWithReceipt(method, args);
var data = await contract.SendWithReceipt(method, args);
return data.receipt;
}
catch (Web3Exception e)
Expand All @@ -486,7 +486,7 @@ public static void PrintObject(object obj)
}

#endregion

#endregion
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public static ABICSharpConverter Instance
}

// UI rendering method
private void OnGUI()
private void OnGUI()
{
var style = new GUIStyle(GUI.skin.label) { richText = true };

Expand Down
2 changes: 1 addition & 1 deletion Packages/io.chainsafe.web3-unity/Editor/ABIConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public static void ShowWindow()
{
GetWindow<ABIWindow>("ChainSafe ABI Formatter");
}


private void OnGUI()
{
Expand Down
30 changes: 15 additions & 15 deletions Packages/io.chainsafe.web3-unity/Editor/ConnectionHandlerEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,60 +12,60 @@ public struct Provider
{
[JsonProperty("name")]
public string Name { get; private set; }

[JsonProperty("path")]
public string Path { get; private set; }
}

private bool _foldout;

public override void OnInspectorGUI()
{
base.OnInspectorGUI();

var providers = Resources.LoadAll<ConnectionProviderConfig>(string.Empty);

_foldout = EditorGUILayout.Foldout(_foldout, "Connection Providers");

if (_foldout)
{
List<ConnectionProvider> availableProviders = new List<ConnectionProvider>();

var providersProperty = serializedObject.FindProperty("providers");

int arraySize = providersProperty.arraySize;

for (int i = 0; i < arraySize; i++)
{
var providerProperty = providersProperty.GetArrayElementAtIndex(i);

if (providerProperty.objectReferenceValue == null)
{
providersProperty.DeleteArrayElementAtIndex(i);

serializedObject.ApplyModifiedProperties();

return;
}

availableProviders.Add(providerProperty.objectReferenceValue as ConnectionProvider);
}

foreach (var provider in providers)
{
var loadedProvider = provider.ProviderRow;

if (loadedProvider == null)
{
Debug.LogWarning($"Error loading {provider.Name} Provider.");

continue;
}

EditorGUI.BeginChangeCheck();

bool isAvailable = availableProviders.Contains(loadedProvider);

isAvailable = GUILayout.Toggle(isAvailable, provider.Name);

if (EditorGUI.EndChangeCheck())
Expand All @@ -83,7 +83,7 @@ public override void OnInspectorGUI()
}

serializedObject.ApplyModifiedProperties();

return;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ namespace ChainSafe.Gaming.Evm.Contracts.Custom
{
public class {CLASS_NAME} : ICustomContract
{
public string Address => OriginalContract.Address;
kantagara marked this conversation as resolved.
Show resolved Hide resolved

public string ABI => "{CONTRACT_ABI}";

Expand Down

Large diffs are not rendered by default.

Loading
Loading