Skip to content

Web3Accessor -> Web3Unity #1129

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
kantagara merged 11 commits into from
Sep 16, 2024
Merged

Web3Accessor -> Web3Unity #1129

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f31e7f6
ChainSafeManager initial implementation
rob1997 Sep 9, 2024
46655e3
checkpoint
rob1997 Sep 9, 2024
5456132
checkpoint
rob1997 Sep 9, 2024
fea3051
web3unity object finalized
rob1997 Sep 13, 2024
cd556fe
Docs and some improvements
rob1997 Sep 13, 2024
58c73ac
Merge branch 'dev' into rob/web3accessor-chainsafe-1064
rob1997 Sep 13, 2024
d9dc5ab
registries and manifest fix
rob1997 Sep 13, 2024
3c51ed4
made requested changes
rob1997 Sep 13, 2024
ed1ad45
null ref fix
rob1997 Sep 13, 2024
0a5c9bd
Merge branch 'dev' into rob/web3accessor-chainsafe-1064
rob1997 Sep 13, 2024
7b86ff2
Merge branch 'dev' into rob/web3accessor-chainsafe-1064
kantagara Sep 16, 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
48 changes: 24 additions & 24 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 @@ -53,7 +53,7 @@ public class Marketplace
/// <returns>MarketplaceModel.MarketplaceItemsResponse</returns>
public static async Task<MarketplaceModel.MarketplaceItemsResponse> GetProjectItems()
{
var path = $"/items?chainId={Web3Accessor.Web3.ChainConfig.ChainId}";
var path = $"/items?chainId={ChainSafeManager.Web3.ChainConfig.ChainId}";
var response = await CSServer.GetData<MarketplaceModel.MarketplaceItemsResponse>(path);
return response;
}
Expand Down Expand Up @@ -92,7 +92,7 @@ public class Marketplace
/// <returns>NftTokenModel.CollectionItemsResponse</returns>
public static async Task<NftTokenModel.CollectionItemsResponse> GetProjectTokens()
{
var path = $"/tokens?chainId={Web3Accessor.Web3.ChainConfig.ChainId}";
var path = $"/tokens?chainId={ChainSafeManager.Web3.ChainConfig.ChainId}";
var response = await CSServer.GetData<NftTokenModel.CollectionItemsResponse>(path);
return response;
}
Expand Down Expand Up @@ -168,13 +168,13 @@ public static async Task<TransactionReceipt> Create721Collection(string _bearerT
var formData = new List<IMultipartFormSection>
{
new MultipartFormDataSection("name", _name),
new MultipartFormDataSection("owner", Web3Accessor.Web3.Signer.PublicAddress),
new MultipartFormDataSection("chain_id", Web3Accessor.Web3.ChainConfig.ChainId),
new MultipartFormDataSection("projectID", Web3Accessor.Web3.ProjectConfig.ProjectId),
new MultipartFormDataSection("owner", ChainSafeManager.Web3.Signer.PublicAddress),
new MultipartFormDataSection("chain_id", ChainSafeManager.Web3.ChainConfig.ChainId),
new MultipartFormDataSection("projectID", ChainSafeManager.Web3.ProjectConfig.ProjectId),
new MultipartFormFileSection("logo", logoImageData, "logo.png", "image/png"),
new MultipartFormFileSection("banner", bannerImageData, "banner.png", "image/png"),
new MultipartFormDataSection("isImported", "true"),
new MultipartFormDataSection("contractAddress", ChainSafeContracts.MarketplaceContracts[Web3Accessor.Web3.ChainConfig.ChainId]),
new MultipartFormDataSection("contractAddress", ChainSafeContracts.MarketplaceContracts[ChainSafeManager.Web3.ChainConfig.ChainId]),
new MultipartFormDataSection("type", "ERC721")
};
if (!string.IsNullOrEmpty(_description))
Expand All @@ -187,14 +187,14 @@ public static async Task<TransactionReceipt> Create721Collection(string _bearerT
var method = "create721Collection";
object[] args =
{
Web3Accessor.Web3.ProjectConfig.ProjectId,
ChainSafeManager.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 contract = ChainSafeManager.Web3.ContractBuilder.Build(ABI.MarketplaceFactory, ChainSafeContracts.MarketplaceContracts[ChainSafeManager.Web3.ChainConfig.ChainId]);
var data = await contract.SendWithReceipt(method, args);
return data.receipt;
}
Expand All @@ -217,13 +217,13 @@ public static async Task<TransactionReceipt> Create1155Collection(string _bearer
var formData = new List<IMultipartFormSection>
{
new MultipartFormDataSection("name", _name),
new MultipartFormDataSection("owner", Web3Accessor.Web3.Signer.PublicAddress),
new MultipartFormDataSection("chain_id", Web3Accessor.Web3.ChainConfig.ChainId),
new MultipartFormDataSection("projectID", Web3Accessor.Web3.ProjectConfig.ProjectId),
new MultipartFormDataSection("owner", ChainSafeManager.Web3.Signer.PublicAddress),
new MultipartFormDataSection("chain_id", ChainSafeManager.Web3.ChainConfig.ChainId),
new MultipartFormDataSection("projectID", ChainSafeManager.Web3.ProjectConfig.ProjectId),
new MultipartFormFileSection("logo", logoImageData, "logo.png", "image/png"),
new MultipartFormFileSection("banner", bannerImageData, "banner.png", "image/png"),
new MultipartFormDataSection("isImported", "true"),
new MultipartFormDataSection("contractAddress", ChainSafeContracts.MarketplaceContracts[Web3Accessor.Web3.ChainConfig.ChainId]),
new MultipartFormDataSection("contractAddress", ChainSafeContracts.MarketplaceContracts[ChainSafeManager.Web3.ChainConfig.ChainId]),
new MultipartFormDataSection("type", "ERC1155")
};
if (!string.IsNullOrEmpty(_description))
Expand All @@ -236,12 +236,12 @@ public static async Task<TransactionReceipt> Create1155Collection(string _bearer
var method = "create1155Collection";
object[] args =
{
Web3Accessor.Web3.ProjectConfig.ProjectId,
ChainSafeManager.Web3.ProjectConfig.ProjectId,
collectionData.id,
collectionData.banner,
_isMintingPublic
};
var contract = Web3Accessor.Web3.ContractBuilder.Build(ABI.MarketplaceFactory, ChainSafeContracts.MarketplaceContracts[Web3Accessor.Web3.ChainConfig.ChainId]);
var contract = ChainSafeManager.Web3.ContractBuilder.Build(ABI.MarketplaceFactory, ChainSafeContracts.MarketplaceContracts[ChainSafeManager.Web3.ChainConfig.ChainId]);
var data = await contract.SendWithReceipt(method, args);
return data.receipt;
}
Expand Down Expand Up @@ -283,10 +283,10 @@ public static async Task<TransactionReceipt> Mint721CollectionNft(string _bearer
var method = "mint";
object[] args =
{
Web3Accessor.Web3.Signer.PublicAddress,
ChainSafeManager.Web3.Signer.PublicAddress,
collectionData.cid
};
var contract = Web3Accessor.Web3.ContractBuilder.Build(ABI.GeneralErc721, _collectionContract);
var contract = ChainSafeManager.Web3.ContractBuilder.Build(ABI.GeneralErc721, _collectionContract);
var txArgs = new TransactionRequest
{
GasLimit = new HexBigInteger(90000)
Expand Down Expand Up @@ -339,12 +339,12 @@ public static async Task<TransactionReceipt> Mint1155CollectionNft(string _beare
Debug.Log($"Amount3: {amount}");
object[] args =
{
Web3Accessor.Web3.Signer.PublicAddress,
ChainSafeManager.Web3.Signer.PublicAddress,
collectionData.cid,
amount
};

var contract = Web3Accessor.Web3.ContractBuilder.Build(ABI.GeneralErc1155, _collectionContract);
var contract = ChainSafeManager.Web3.ContractBuilder.Build(ABI.GeneralErc1155, _collectionContract);
var txArgs = new TransactionRequest
{
GasLimit = new HexBigInteger(90000)
Expand Down Expand Up @@ -395,7 +395,7 @@ public static async Task<TransactionReceipt> CreateMarketplace(string _bearerTok
var formData = new List<IMultipartFormSection>
{
new MultipartFormDataSection("name", _name),
new MultipartFormDataSection("chain_id", Web3Accessor.Web3.ChainConfig.ChainId),
new MultipartFormDataSection("chain_id", ChainSafeManager.Web3.ChainConfig.ChainId),
new MultipartFormFileSection("banner", bannerImageData, "banner.png", "image/png")
};
if (!string.IsNullOrEmpty(_description))
Expand All @@ -409,11 +409,11 @@ public static async Task<TransactionReceipt> CreateMarketplace(string _bearerTok
var method = "createMarketplace";
object[] args =
{
Web3Accessor.Web3.ProjectConfig.ProjectId,
ChainSafeManager.Web3.ProjectConfig.ProjectId,
collectionData.id,
_whitelisting
};
var contract = Web3Accessor.Web3.ContractBuilder.Build(ABI.MarketplaceFactory, ChainSafeContracts.MarketplaceContracts[Web3Accessor.Web3.ChainConfig.ChainId]);
var contract = ChainSafeManager.Web3.ContractBuilder.Build(ABI.MarketplaceFactory, ChainSafeContracts.MarketplaceContracts[ChainSafeManager.Web3.ChainConfig.ChainId]);
var data = await contract.SendWithReceipt(method, args);
return data.receipt;
}
Expand Down Expand Up @@ -456,7 +456,7 @@ public static async Task<TransactionReceipt> SetApprovalMarketplace(string _nftC
_permission
};
var abi = _type == "ERC721" ? Token.ABI.GeneralErc721 : Token.ABI.GeneralErc1155;
var contract = Web3Accessor.Web3.ContractBuilder.Build(abi, _nftContract);
var contract = ChainSafeManager.Web3.ContractBuilder.Build(abi, _nftContract);
var data = await contract.SendWithReceipt(method, args);
return data.receipt;
}
Expand Down Expand Up @@ -488,7 +488,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 contract = ChainSafeManager.Web3.ContractBuilder.Build(ABI.Marketplace, _marketplaceContract);
var data = await contract.SendWithReceipt(method, args, tx);
return data.receipt;
}
Expand Down Expand Up @@ -522,7 +522,7 @@ public static async Task<TransactionReceipt> ListNftsToMarketplace(string _marke
priceInWei,
deadline
};
var contract = Web3Accessor.Web3.ContractBuilder.Build(ABI.Marketplace, _marketplaceContract);
var contract = ChainSafeManager.Web3.ContractBuilder.Build(ABI.Marketplace, _marketplaceContract);
var data = await contract.SendWithReceipt(method, args);
return data.receipt;
}
Expand Down
12 changes: 6 additions & 6 deletions ....chainsafe.web3-unity.web3auth/Runtime/WalletGUI/Scripts/Web3AuthWalletGUITokenManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private async void SetTokens()
customTokenPlaceHolder.SetActive(false);
customTokenContract = data[0];
customTokenSymbolText.text = data[1].ToUpper();
var balance = await Web3Accessor.Web3.Erc20.GetBalanceOf(customTokenContract, Web3Accessor.Web3.Signer.PublicAddress);
var balance = await ChainSafeManager.Web3.Erc20.GetBalanceOf(customTokenContract, ChainSafeManager.Web3.Signer.PublicAddress);
var customTokenValue = (decimal)balance / (decimal)BigInteger.Pow(10, 18);
customTokenAmountText.text = customTokenValue.ToString("N18");
customTokenDisplay.SetActive(true);
Expand All @@ -83,8 +83,8 @@ private async void SetTokens()
customTokenDisplay.SetActive(false);
}
// Set native token
nativeTokenSymbolText.text = Web3Accessor.Web3.ChainConfig.Symbol.ToUpper();
var hexBalance = await Web3Accessor.Web3.RpcProvider.GetBalance(Web3Accessor.Web3.Signer.PublicAddress);
nativeTokenSymbolText.text = ChainSafeManager.Web3.ChainConfig.Symbol.ToUpper();
var hexBalance = await ChainSafeManager.Web3.RpcProvider.GetBalance(ChainSafeManager.Web3.Signer.PublicAddress);
var weiBalance = BigInteger.Parse(hexBalance.ToString());
decimal ethBalance = (decimal)weiBalance / (decimal)Math.Pow(10, 18);
nativeTokenAmountText.text = ethBalance.ToString("0.#########");
Expand Down Expand Up @@ -115,7 +115,7 @@ private async void GetSymbol()
lastCheckedAddress = customTokenAddressInput.text;
try
{
symbolTask = Web3Accessor.Web3.Erc20.GetSymbol(customTokenAddressInput.text);
symbolTask = ChainSafeManager.Web3.Erc20.GetSymbol(customTokenAddressInput.text);
customTokenSymbolInput.text = await symbolTask;
addTokenButton.gameObject.SetActive(true);
}
Expand Down Expand Up @@ -178,13 +178,13 @@ private async void TransferTokens()
case 0:
BigInteger amountInWei0 = BigInteger.Parse((decimal.Parse(transferTokensAmountInput.text) * (decimal)Math.Pow(10, 18)).ToString("F0"));
transferTokensContainer.SetActive(false);
var response0 = await Evm.SendTransaction(Web3Accessor.Web3, transferTokensWalletInput.text, amountInWei0);
var response0 = await Evm.SendTransaction(ChainSafeManager.Web3, transferTokensWalletInput.text, amountInWei0);
Debug.Log($"Transfer Complete! {response0}");
break;
case 1:
BigInteger amountInWei1 = BigInteger.Parse((decimal.Parse(transferTokensAmountInput.text) * (decimal)Math.Pow(10, 18)).ToString("F0"));
transferTokensContainer.SetActive(false);
var response1 = await Web3Accessor.Web3.Erc20.Transfer(customTokenContract, transferTokensWalletInput.text, amountInWei1);
var response1 = await ChainSafeManager.Web3.Erc20.Transfer(customTokenContract, transferTokensWalletInput.text, amountInWei1);
Debug.Log($"Transfer Complete! {response1}");
break;
default:
Expand Down
4 changes: 2 additions & 2 deletions .../io.chainsafe.web3-unity.web3auth/Runtime/WalletGUI/Scripts/Web3AuthWalletGUITxManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ private void Awake()
rejectRequestButton.onClick.AddListener(RejectRequest);
autoTxToggle.onValueChanged.AddListener(ToggleAutoTx);

_transactionHandler = Web3Accessor.Web3.ServiceProvider.GetService<IWeb3AuthTransactionHandler>();
_transactionHandler = ChainSafeManager.Web3.ServiceProvider.GetService<IWeb3AuthTransactionHandler>();
}

/// <summary>
Expand Down Expand Up @@ -226,7 +226,7 @@ private void UpdateTransactionHistory(int txObjectIndex, string txNumber, string
/// <param name="txHash"></param>
private void OpenBlockExplorer(string txHash)
{
Application.OpenURL($"{Web3Accessor.Web3.ChainConfig.BlockExplorerUrl}/tx/{txHash}");
Application.OpenURL($"{ChainSafeManager.Web3.ChainConfig.BlockExplorerUrl}/tx/{txHash}");
}

/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions .../io.chainsafe.web3-unity.web3auth/Runtime/WalletGUI/Scripts/Web3AuthWalletGUIUIManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public class Web3AuthWalletGUIUIManager : MonoBehaviour
/// </summary>
private void Start()
{
if (Web3Accessor.Web3 == null)
if (ChainSafeManager.Web3 == null)
{
Debug.LogError("Web3 instance not set.");

Expand All @@ -62,7 +62,7 @@ private void Start()

InitializeButtons();
originalOrientation = Screen.orientation;
walletAddressText.text = Web3Accessor.Web3.Signer.PublicAddress;
walletAddressText.text = ChainSafeManager.Web3.Signer.PublicAddress;
}

/// <summary>
Expand Down Expand Up @@ -196,7 +196,7 @@ private IEnumerator CheckHoldPrivateKeyButtonInput()
/// </summary>
private void SetPrivateKey()
{
var accountProvider = (IAccountProvider)Web3Accessor.Web3.ServiceProvider.GetService(typeof(IAccountProvider));
var accountProvider = (IAccountProvider)ChainSafeManager.Web3.ServiceProvider.GetService(typeof(IAccountProvider));

privateKeyText.text = ((Account) accountProvider.Account).PrivateKey;
}
Expand Down
Loading