diff --git a/src/Mx.NET.SDK/Mx.NET.SDK.csproj b/src/Mx.NET.SDK/Mx.NET.SDK.csproj index b1c0ce4..106f0d1 100644 --- a/src/Mx.NET.SDK/Mx.NET.SDK.csproj +++ b/src/Mx.NET.SDK/Mx.NET.SDK.csproj @@ -11,7 +11,7 @@ https://github.com/RemarkableTools/Mx.NET.SDK GitHub Remarkable Tools - 1.0.7 + 1.0.8 true RemarkableTools.Mx README.md diff --git a/src/Mx.NET.SDK/TransactionsManager/ESDTTransactionRequest.cs b/src/Mx.NET.SDK/TransactionsManager/ESDTTransactionRequest.cs index ef0550a..03d2e6f 100644 --- a/src/Mx.NET.SDK/TransactionsManager/ESDTTransactionRequest.cs +++ b/src/Mx.NET.SDK/TransactionsManager/ESDTTransactionRequest.cs @@ -313,8 +313,6 @@ public static TransactionRequest IssueNFT( CollectionProperties properties = null, params IBinaryType[] args) { - var cost = networkConfig.ChainId == "T" ? ESDTAmount.EGLD("5") : ESDTAmount.EGLD("0.05"); - if (!_nameValidation.IsMatch(collectionName)) throw new ArgumentException("Length should be between 3 and 20 characters, alphanumeric characters only", nameof(collectionName)); @@ -329,26 +327,26 @@ public static TransactionRequest IssueNFT( if (properties != null) { arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanFreeze)); - arguments.Add(BooleanValue.From(properties.CanFreeze)); + arguments.Add(BytesValue.FromUtf8(properties.CanFreeze.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanWipe)); - arguments.Add(BooleanValue.From(properties.CanWipe)); + arguments.Add(BytesValue.FromUtf8(properties.CanWipe.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanPause)); - arguments.Add(BooleanValue.From(properties.CanPause)); + arguments.Add(BytesValue.FromUtf8(properties.CanPause.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanTransferNftCreateRole)); - arguments.Add(BooleanValue.From(properties.CanTransferNFTCreateRole)); + arguments.Add(BytesValue.FromUtf8(properties.CanTransferNFTCreateRole.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanChangeOwner)); - arguments.Add(BooleanValue.From(properties.CanChangeOwner)); + arguments.Add(BytesValue.FromUtf8(properties.CanChangeOwner.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanUpgrade)); - arguments.Add(BooleanValue.From(properties.CanUpgrade)); + arguments.Add(BytesValue.FromUtf8(properties.CanUpgrade.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanAddSpecialRoles)); - arguments.Add(BooleanValue.From(properties.CanAddSpecialRoles)); + arguments.Add(BytesValue.FromUtf8(properties.CanAddSpecialRoles.ToString().ToLower())); arguments.AddRange(args); } var transaction = TransactionRequest.CreateCallSmartContractTransactionRequest(networkConfig, account, SYSTEM_SMART_CONTRACT_ADDRESS, - cost, + ESDTAmount.EGLD("0.05"), ISSUE_NON_FUNGIBLE, arguments.ToArray()); @@ -391,19 +389,19 @@ public static TransactionRequest IssueSFT( if (properties != null) { arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanFreeze)); - arguments.Add(BooleanValue.From(properties.CanFreeze)); + arguments.Add(BytesValue.FromUtf8(properties.CanFreeze.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanWipe)); - arguments.Add(BooleanValue.From(properties.CanWipe)); + arguments.Add(BytesValue.FromUtf8(properties.CanWipe.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanPause)); - arguments.Add(BooleanValue.From(properties.CanPause)); + arguments.Add(BytesValue.FromUtf8(properties.CanPause.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanTransferNftCreateRole)); - arguments.Add(BooleanValue.From(properties.CanTransferNFTCreateRole)); + arguments.Add(BytesValue.FromUtf8(properties.CanTransferNFTCreateRole.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanChangeOwner)); - arguments.Add(BooleanValue.From(properties.CanChangeOwner)); + arguments.Add(BytesValue.FromUtf8(properties.CanChangeOwner.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanUpgrade)); - arguments.Add(BooleanValue.From(properties.CanUpgrade)); + arguments.Add(BytesValue.FromUtf8(properties.CanUpgrade.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanAddSpecialRoles)); - arguments.Add(BooleanValue.From(properties.CanAddSpecialRoles)); + arguments.Add(BytesValue.FromUtf8(properties.CanAddSpecialRoles.ToString().ToLower())); arguments.AddRange(args); } @@ -459,19 +457,19 @@ public static TransactionRequest IssueMetaESDT( if (properties != null) { arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanFreeze)); - arguments.Add(BooleanValue.From(properties.CanFreeze)); + arguments.Add(BytesValue.FromUtf8(properties.CanFreeze.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanWipe)); - arguments.Add(BooleanValue.From(properties.CanWipe)); + arguments.Add(BytesValue.FromUtf8(properties.CanWipe.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanPause)); - arguments.Add(BooleanValue.From(properties.CanPause)); + arguments.Add(BytesValue.FromUtf8(properties.CanPause.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanTransferNftCreateRole)); - arguments.Add(BooleanValue.From(properties.CanTransferNFTCreateRole)); + arguments.Add(BytesValue.FromUtf8(properties.CanTransferNFTCreateRole.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanChangeOwner)); - arguments.Add(BooleanValue.From(properties.CanChangeOwner)); + arguments.Add(BytesValue.FromUtf8(properties.CanChangeOwner.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanUpgrade)); - arguments.Add(BooleanValue.From(properties.CanUpgrade)); + arguments.Add(BytesValue.FromUtf8(properties.CanUpgrade.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanAddSpecialRoles)); - arguments.Add(BooleanValue.From(properties.CanAddSpecialRoles)); + arguments.Add(BytesValue.FromUtf8(properties.CanAddSpecialRoles.ToString().ToLower())); arguments.AddRange(args); } @@ -1029,19 +1027,19 @@ public static TransactionRequest ChangeProperties( { collectionIdentifier, BytesValue.FromUtf8(ESDTCollectionProperties.CanFreeze), - BooleanValue.From(properties.CanFreeze), + BytesValue.FromUtf8(properties.CanFreeze.ToString().ToLower()), BytesValue.FromUtf8(ESDTCollectionProperties.CanWipe), - BooleanValue.From(properties.CanWipe), + BytesValue.FromUtf8(properties.CanWipe.ToString().ToLower()), BytesValue.FromUtf8(ESDTCollectionProperties.CanPause), - BooleanValue.From(properties.CanPause), + BytesValue.FromUtf8(properties.CanPause.ToString().ToLower()), BytesValue.FromUtf8(ESDTCollectionProperties.CanTransferNftCreateRole), - BooleanValue.From(properties.CanTransferNFTCreateRole), + BytesValue.FromUtf8(properties.CanTransferNFTCreateRole.ToString().ToLower()), BytesValue.FromUtf8(ESDTCollectionProperties.CanChangeOwner), - BooleanValue.From(properties.CanChangeOwner), + BytesValue.FromUtf8(properties.CanChangeOwner.ToString().ToLower()), BytesValue.FromUtf8(ESDTCollectionProperties.CanUpgrade), - BooleanValue.From(properties.CanUpgrade), + BytesValue.FromUtf8(properties.CanUpgrade.ToString().ToLower()), BytesValue.FromUtf8(ESDTCollectionProperties.CanAddSpecialRoles), - BooleanValue.From(properties.CanAddSpecialRoles) + BytesValue.FromUtf8(properties.CanAddSpecialRoles.ToString().ToLower()) }; arguments.AddRange(args); diff --git a/src/Mx.NET.SDK/TransactionsManager/TokenTransactionRequest.cs b/src/Mx.NET.SDK/TransactionsManager/TokenTransactionRequest.cs index 32608a1..7672ada 100644 --- a/src/Mx.NET.SDK/TransactionsManager/TokenTransactionRequest.cs +++ b/src/Mx.NET.SDK/TransactionsManager/TokenTransactionRequest.cs @@ -292,13 +292,11 @@ public static TransactionRequest IssueToken( Account account, string tokenName, string tokenTicker, - BigInteger initialSupply, + ESDTAmount initialSupply, int numberOfDecimals, TokenProperties properties = null, params IBinaryType[] args) { - var cost = networkConfig.ChainId == "T" ? ESDTAmount.EGLD("5") : ESDTAmount.EGLD("0.05"); - if (!_nameValidation.IsMatch(tokenName)) throw new ArgumentException("Length should be between 3 and 20 characters, alphanumeric characters only", nameof(tokenName)); @@ -312,34 +310,34 @@ public static TransactionRequest IssueToken( { BytesValue.FromUtf8(tokenName), ESDTIdentifierValue.From(tokenTicker), - NumericValue.BigUintValue(initialSupply), + NumericValue.BigUintValue(initialSupply.Value), NumericValue.I32Value(numberOfDecimals) }; if (properties != null) { arguments.Add(BytesValue.FromUtf8(ESDTTokenProperties.CanFreeze)); - arguments.Add(BooleanValue.From(properties.CanFreeze)); + arguments.Add(BytesValue.FromUtf8(properties.CanFreeze.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTTokenProperties.CanWipe)); - arguments.Add(BooleanValue.From(properties.CanWipe)); + arguments.Add(BytesValue.FromUtf8(properties.CanWipe.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTTokenProperties.CanPause)); - arguments.Add(BooleanValue.From(properties.CanPause)); + arguments.Add(BytesValue.FromUtf8(properties.CanPause.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTTokenProperties.CanMint)); - arguments.Add(BooleanValue.From(properties.CanMint)); + arguments.Add(BytesValue.FromUtf8(properties.CanMint.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTTokenProperties.CanBurn)); - arguments.Add(BooleanValue.From(properties.CanBurn)); + arguments.Add(BytesValue.FromUtf8(properties.CanBurn.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTTokenProperties.CanChangeOwner)); - arguments.Add(BooleanValue.From(properties.CanChangeOwner)); + arguments.Add(BytesValue.FromUtf8(properties.CanChangeOwner.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTTokenProperties.CanUpgrade)); - arguments.Add(BooleanValue.From(properties.CanUpgrade)); + arguments.Add(BytesValue.FromUtf8(properties.CanUpgrade.ToString().ToLower())); arguments.Add(BytesValue.FromUtf8(ESDTTokenProperties.CanAddSpecialRoles)); - arguments.Add(BooleanValue.From(properties.CanAddSpecialRoles ?? true)); + arguments.Add(BytesValue.FromUtf8((properties.CanAddSpecialRoles ?? true).ToString().ToLower())); arguments.AddRange(args); } var transaction = TransactionRequest.CreateCallSmartContractTransactionRequest(networkConfig, account, SYSTEM_SMART_CONTRACT_ADDRESS, - cost, + ESDTAmount.EGLD("0.05"), ISSUE, arguments.ToArray()); @@ -660,21 +658,21 @@ public static TransactionRequest ChangeProperties( { tokenIdentifier, BytesValue.FromUtf8(ESDTTokenProperties.CanFreeze), - BooleanValue.From(properties.CanFreeze), + BytesValue.FromUtf8(properties.CanFreeze.ToString().ToLower()), BytesValue.FromUtf8(ESDTTokenProperties.CanWipe), - BooleanValue.From(properties.CanWipe), + BytesValue.FromUtf8(properties.CanWipe.ToString().ToLower()), BytesValue.FromUtf8(ESDTTokenProperties.CanPause), - BooleanValue.From(properties.CanPause), + BytesValue.FromUtf8(properties.CanPause.ToString().ToLower()), BytesValue.FromUtf8(ESDTTokenProperties.CanMint), - BooleanValue.From(properties.CanMint), + BytesValue.FromUtf8(properties.CanMint.ToString().ToLower()), BytesValue.FromUtf8(ESDTTokenProperties.CanBurn), - BooleanValue.From(properties.CanBurn), + BytesValue.FromUtf8(properties.CanBurn.ToString().ToLower()), BytesValue.FromUtf8(ESDTTokenProperties.CanChangeOwner), - BooleanValue.From(properties.CanChangeOwner), + BytesValue.FromUtf8(properties.CanChangeOwner.ToString().ToLower()), BytesValue.FromUtf8(ESDTTokenProperties.CanUpgrade), - BooleanValue.From(properties.CanUpgrade), + BytesValue.FromUtf8(properties.CanUpgrade.ToString().ToLower()), BytesValue.FromUtf8(ESDTTokenProperties.CanAddSpecialRoles), - BooleanValue.From(properties.CanAddSpecialRoles ?? true) + BytesValue.FromUtf8((properties.CanAddSpecialRoles ?? true).ToString().ToLower()) }; arguments.AddRange(args);