Skip to content

Commit a7dc3cf

Browse files
axenteoctavianaxenteoctavian
authored
Merge pull request #11 from RemarkableTools/dev
Dev to main
2 parents b01771a + c78e22e commit a7dc3cf

File tree

3 files changed

+49
-53
lines changed

3 files changed

+49
-53
lines changed

‎src/Mx.NET.SDK/Mx.NET.SDK.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<RepositoryUrl>https://github.com/RemarkableTools/Mx.NET.SDK</RepositoryUrl>
1212
<RepositoryType>GitHub</RepositoryType>
1313
<Company>Remarkable Tools</Company>
14-
<Version>1.0.7</Version>
14+
<Version>1.0.8</Version>
1515
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1616
<Title>RemarkableTools.Mx</Title>
1717
<PackageReadmeFile>README.md</PackageReadmeFile>

‎src/Mx.NET.SDK/TransactionsManager/ESDTTransactionRequest.cs‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,6 @@ public static TransactionRequest IssueNFT(
313313
CollectionProperties properties = null,
314314
params IBinaryType[] args)
315315
{
316-
var cost = networkConfig.ChainId == "T" ? ESDTAmount.EGLD("5") : ESDTAmount.EGLD("0.05");
317-
318316
if (!_nameValidation.IsMatch(collectionName))
319317
throw new ArgumentException("Length should be between 3 and 20 characters, alphanumeric characters only", nameof(collectionName));
320318

@@ -329,26 +327,26 @@ public static TransactionRequest IssueNFT(
329327
if (properties != null)
330328
{
331329
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanFreeze));
332-
arguments.Add(BooleanValue.From(properties.CanFreeze));
330+
arguments.Add(BytesValue.FromUtf8(properties.CanFreeze.ToString().ToLower()));
333331
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanWipe));
334-
arguments.Add(BooleanValue.From(properties.CanWipe));
332+
arguments.Add(BytesValue.FromUtf8(properties.CanWipe.ToString().ToLower()));
335333
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanPause));
336-
arguments.Add(BooleanValue.From(properties.CanPause));
334+
arguments.Add(BytesValue.FromUtf8(properties.CanPause.ToString().ToLower()));
337335
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanTransferNftCreateRole));
338-
arguments.Add(BooleanValue.From(properties.CanTransferNFTCreateRole));
336+
arguments.Add(BytesValue.FromUtf8(properties.CanTransferNFTCreateRole.ToString().ToLower()));
339337
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanChangeOwner));
340-
arguments.Add(BooleanValue.From(properties.CanChangeOwner));
338+
arguments.Add(BytesValue.FromUtf8(properties.CanChangeOwner.ToString().ToLower()));
341339
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanUpgrade));
342-
arguments.Add(BooleanValue.From(properties.CanUpgrade));
340+
arguments.Add(BytesValue.FromUtf8(properties.CanUpgrade.ToString().ToLower()));
343341
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanAddSpecialRoles));
344-
arguments.Add(BooleanValue.From(properties.CanAddSpecialRoles));
342+
arguments.Add(BytesValue.FromUtf8(properties.CanAddSpecialRoles.ToString().ToLower()));
345343
arguments.AddRange(args);
346344
}
347345

348346
var transaction = TransactionRequest.CreateCallSmartContractTransactionRequest(networkConfig,
349347
account,
350348
SYSTEM_SMART_CONTRACT_ADDRESS,
351-
cost,
349+
ESDTAmount.EGLD("0.05"),
352350
ISSUE_NON_FUNGIBLE,
353351
arguments.ToArray());
354352

@@ -391,19 +389,19 @@ public static TransactionRequest IssueSFT(
391389
if (properties != null)
392390
{
393391
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanFreeze));
394-
arguments.Add(BooleanValue.From(properties.CanFreeze));
392+
arguments.Add(BytesValue.FromUtf8(properties.CanFreeze.ToString().ToLower()));
395393
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanWipe));
396-
arguments.Add(BooleanValue.From(properties.CanWipe));
394+
arguments.Add(BytesValue.FromUtf8(properties.CanWipe.ToString().ToLower()));
397395
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanPause));
398-
arguments.Add(BooleanValue.From(properties.CanPause));
396+
arguments.Add(BytesValue.FromUtf8(properties.CanPause.ToString().ToLower()));
399397
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanTransferNftCreateRole));
400-
arguments.Add(BooleanValue.From(properties.CanTransferNFTCreateRole));
398+
arguments.Add(BytesValue.FromUtf8(properties.CanTransferNFTCreateRole.ToString().ToLower()));
401399
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanChangeOwner));
402-
arguments.Add(BooleanValue.From(properties.CanChangeOwner));
400+
arguments.Add(BytesValue.FromUtf8(properties.CanChangeOwner.ToString().ToLower()));
403401
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanUpgrade));
404-
arguments.Add(BooleanValue.From(properties.CanUpgrade));
402+
arguments.Add(BytesValue.FromUtf8(properties.CanUpgrade.ToString().ToLower()));
405403
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanAddSpecialRoles));
406-
arguments.Add(BooleanValue.From(properties.CanAddSpecialRoles));
404+
arguments.Add(BytesValue.FromUtf8(properties.CanAddSpecialRoles.ToString().ToLower()));
407405
arguments.AddRange(args);
408406
}
409407

@@ -459,19 +457,19 @@ public static TransactionRequest IssueMetaESDT(
459457
if (properties != null)
460458
{
461459
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanFreeze));
462-
arguments.Add(BooleanValue.From(properties.CanFreeze));
460+
arguments.Add(BytesValue.FromUtf8(properties.CanFreeze.ToString().ToLower()));
463461
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanWipe));
464-
arguments.Add(BooleanValue.From(properties.CanWipe));
462+
arguments.Add(BytesValue.FromUtf8(properties.CanWipe.ToString().ToLower()));
465463
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanPause));
466-
arguments.Add(BooleanValue.From(properties.CanPause));
464+
arguments.Add(BytesValue.FromUtf8(properties.CanPause.ToString().ToLower()));
467465
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanTransferNftCreateRole));
468-
arguments.Add(BooleanValue.From(properties.CanTransferNFTCreateRole));
466+
arguments.Add(BytesValue.FromUtf8(properties.CanTransferNFTCreateRole.ToString().ToLower()));
469467
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanChangeOwner));
470-
arguments.Add(BooleanValue.From(properties.CanChangeOwner));
468+
arguments.Add(BytesValue.FromUtf8(properties.CanChangeOwner.ToString().ToLower()));
471469
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanUpgrade));
472-
arguments.Add(BooleanValue.From(properties.CanUpgrade));
470+
arguments.Add(BytesValue.FromUtf8(properties.CanUpgrade.ToString().ToLower()));
473471
arguments.Add(BytesValue.FromUtf8(ESDTCollectionProperties.CanAddSpecialRoles));
474-
arguments.Add(BooleanValue.From(properties.CanAddSpecialRoles));
472+
arguments.Add(BytesValue.FromUtf8(properties.CanAddSpecialRoles.ToString().ToLower()));
475473
arguments.AddRange(args);
476474
}
477475

@@ -1029,19 +1027,19 @@ public static TransactionRequest ChangeProperties(
10291027
{
10301028
collectionIdentifier,
10311029
BytesValue.FromUtf8(ESDTCollectionProperties.CanFreeze),
1032-
BooleanValue.From(properties.CanFreeze),
1030+
BytesValue.FromUtf8(properties.CanFreeze.ToString().ToLower()),
10331031
BytesValue.FromUtf8(ESDTCollectionProperties.CanWipe),
1034-
BooleanValue.From(properties.CanWipe),
1032+
BytesValue.FromUtf8(properties.CanWipe.ToString().ToLower()),
10351033
BytesValue.FromUtf8(ESDTCollectionProperties.CanPause),
1036-
BooleanValue.From(properties.CanPause),
1034+
BytesValue.FromUtf8(properties.CanPause.ToString().ToLower()),
10371035
BytesValue.FromUtf8(ESDTCollectionProperties.CanTransferNftCreateRole),
1038-
BooleanValue.From(properties.CanTransferNFTCreateRole),
1036+
BytesValue.FromUtf8(properties.CanTransferNFTCreateRole.ToString().ToLower()),
10391037
BytesValue.FromUtf8(ESDTCollectionProperties.CanChangeOwner),
1040-
BooleanValue.From(properties.CanChangeOwner),
1038+
BytesValue.FromUtf8(properties.CanChangeOwner.ToString().ToLower()),
10411039
BytesValue.FromUtf8(ESDTCollectionProperties.CanUpgrade),
1042-
BooleanValue.From(properties.CanUpgrade),
1040+
BytesValue.FromUtf8(properties.CanUpgrade.ToString().ToLower()),
10431041
BytesValue.FromUtf8(ESDTCollectionProperties.CanAddSpecialRoles),
1044-
BooleanValue.From(properties.CanAddSpecialRoles)
1042+
BytesValue.FromUtf8(properties.CanAddSpecialRoles.ToString().ToLower())
10451043
};
10461044
arguments.AddRange(args);
10471045

‎src/Mx.NET.SDK/TransactionsManager/TokenTransactionRequest.cs‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -292,13 +292,11 @@ public static TransactionRequest IssueToken(
292292
Account account,
293293
string tokenName,
294294
string tokenTicker,
295-
BigInteger initialSupply,
295+
ESDTAmount initialSupply,
296296
int numberOfDecimals,
297297
TokenProperties properties = null,
298298
params IBinaryType[] args)
299299
{
300-
var cost = networkConfig.ChainId == "T" ? ESDTAmount.EGLD("5") : ESDTAmount.EGLD("0.05");
301-
302300
if (!_nameValidation.IsMatch(tokenName))
303301
throw new ArgumentException("Length should be between 3 and 20 characters, alphanumeric characters only", nameof(tokenName));
304302

@@ -312,34 +310,34 @@ public static TransactionRequest IssueToken(
312310
{
313311
BytesValue.FromUtf8(tokenName),
314312
ESDTIdentifierValue.From(tokenTicker),
315-
NumericValue.BigUintValue(initialSupply),
313+
NumericValue.BigUintValue(initialSupply.Value),
316314
NumericValue.I32Value(numberOfDecimals)
317315
};
318316

319317
if (properties != null)
320318
{
321319
arguments.Add(BytesValue.FromUtf8(ESDTTokenProperties.CanFreeze));
322-
arguments.Add(BooleanValue.From(properties.CanFreeze));
320+
arguments.Add(BytesValue.FromUtf8(properties.CanFreeze.ToString().ToLower()));
323321
arguments.Add(BytesValue.FromUtf8(ESDTTokenProperties.CanWipe));
324-
arguments.Add(BooleanValue.From(properties.CanWipe));
322+
arguments.Add(BytesValue.FromUtf8(properties.CanWipe.ToString().ToLower()));
325323
arguments.Add(BytesValue.FromUtf8(ESDTTokenProperties.CanPause));
326-
arguments.Add(BooleanValue.From(properties.CanPause));
324+
arguments.Add(BytesValue.FromUtf8(properties.CanPause.ToString().ToLower()));
327325
arguments.Add(BytesValue.FromUtf8(ESDTTokenProperties.CanMint));
328-
arguments.Add(BooleanValue.From(properties.CanMint));
326+
arguments.Add(BytesValue.FromUtf8(properties.CanMint.ToString().ToLower()));
329327
arguments.Add(BytesValue.FromUtf8(ESDTTokenProperties.CanBurn));
330-
arguments.Add(BooleanValue.From(properties.CanBurn));
328+
arguments.Add(BytesValue.FromUtf8(properties.CanBurn.ToString().ToLower()));
331329
arguments.Add(BytesValue.FromUtf8(ESDTTokenProperties.CanChangeOwner));
332-
arguments.Add(BooleanValue.From(properties.CanChangeOwner));
330+
arguments.Add(BytesValue.FromUtf8(properties.CanChangeOwner.ToString().ToLower()));
333331
arguments.Add(BytesValue.FromUtf8(ESDTTokenProperties.CanUpgrade));
334-
arguments.Add(BooleanValue.From(properties.CanUpgrade));
332+
arguments.Add(BytesValue.FromUtf8(properties.CanUpgrade.ToString().ToLower()));
335333
arguments.Add(BytesValue.FromUtf8(ESDTTokenProperties.CanAddSpecialRoles));
336-
arguments.Add(BooleanValue.From(properties.CanAddSpecialRoles ?? true));
334+
arguments.Add(BytesValue.FromUtf8((properties.CanAddSpecialRoles ?? true).ToString().ToLower()));
337335
arguments.AddRange(args);
338336
}
339337
var transaction = TransactionRequest.CreateCallSmartContractTransactionRequest(networkConfig,
340338
account,
341339
SYSTEM_SMART_CONTRACT_ADDRESS,
342-
cost,
340+
ESDTAmount.EGLD("0.05"),
343341
ISSUE,
344342
arguments.ToArray());
345343

@@ -660,21 +658,21 @@ public static TransactionRequest ChangeProperties(
660658
{
661659
tokenIdentifier,
662660
BytesValue.FromUtf8(ESDTTokenProperties.CanFreeze),
663-
BooleanValue.From(properties.CanFreeze),
661+
BytesValue.FromUtf8(properties.CanFreeze.ToString().ToLower()),
664662
BytesValue.FromUtf8(ESDTTokenProperties.CanWipe),
665-
BooleanValue.From(properties.CanWipe),
663+
BytesValue.FromUtf8(properties.CanWipe.ToString().ToLower()),
666664
BytesValue.FromUtf8(ESDTTokenProperties.CanPause),
667-
BooleanValue.From(properties.CanPause),
665+
BytesValue.FromUtf8(properties.CanPause.ToString().ToLower()),
668666
BytesValue.FromUtf8(ESDTTokenProperties.CanMint),
669-
BooleanValue.From(properties.CanMint),
667+
BytesValue.FromUtf8(properties.CanMint.ToString().ToLower()),
670668
BytesValue.FromUtf8(ESDTTokenProperties.CanBurn),
671-
BooleanValue.From(properties.CanBurn),
669+
BytesValue.FromUtf8(properties.CanBurn.ToString().ToLower()),
672670
BytesValue.FromUtf8(ESDTTokenProperties.CanChangeOwner),
673-
BooleanValue.From(properties.CanChangeOwner),
671+
BytesValue.FromUtf8(properties.CanChangeOwner.ToString().ToLower()),
674672
BytesValue.FromUtf8(ESDTTokenProperties.CanUpgrade),
675-
BooleanValue.From(properties.CanUpgrade),
673+
BytesValue.FromUtf8(properties.CanUpgrade.ToString().ToLower()),
676674
BytesValue.FromUtf8(ESDTTokenProperties.CanAddSpecialRoles),
677-
BooleanValue.From(properties.CanAddSpecialRoles ?? true)
675+
BytesValue.FromUtf8((properties.CanAddSpecialRoles ?? true).ToString().ToLower())
678676
};
679677
arguments.AddRange(args);
680678

0 commit comments

Comments
 (0)