Merge branch 'TOOL-360-add-token-management-controller' into TOOL-365…

…-add-transfers-controller
multiversx · Nov 18, 2024 · 4852ab7 · 4852ab7
2 parents 1643a52 + 266fdb3
commit 4852ab7
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 18 deletions.
diff --git a/src/abi/interaction.local.net.spec.ts b/src/abi/interaction.local.net.spec.ts
@@ -118,7 +118,7 @@ describe("test smart contract interactor", function () {
 
         const transactionCompletionAwaiter = new TransactionWatcher({
             getTransaction: async (hash: string) => {
-                return await provider.getTransaction(hash, true);
+                return await provider.getTransaction(hash);
             },
         });
 
@@ -406,7 +406,7 @@ describe("test smart contract interactor", function () {
 
         const transactionCompletionAwaiter = new TransactionWatcher({
             getTransaction: async (hash: string) => {
-                return await provider.getTransaction(hash, true);
+                return await provider.getTransaction(hash);
             },
         });
 
@@ -600,7 +600,7 @@ describe("test smart contract interactor", function () {
 
         const transactionCompletionAwaiter = new TransactionWatcher({
             getTransaction: async (hash: string) => {
-                return await provider.getTransaction(hash, true);
+                return await provider.getTransaction(hash);
             },
         });
 

diff --git a/src/abi/smartContract.local.net.spec.ts b/src/abi/smartContract.local.net.spec.ts
@@ -35,7 +35,7 @@ describe("test on local testnet", function () {
 
         watcher = new TransactionWatcher({
             getTransaction: async (hash: string) => {
-                return await provider.getTransaction(hash, true);
+                return await provider.getTransaction(hash);
             },
         });
     });

diff --git a/src/abi/smartContractResults.local.net.spec.ts b/src/abi/smartContractResults.local.net.spec.ts
@@ -21,7 +21,7 @@ describe("fetch transactions from local testnet", function () {
         ({ alice } = await loadTestWallets());
         watcher = new TransactionWatcher({
             getTransaction: async (hash: string) => {
-                return await provider.getTransaction(hash, true);
+                return await provider.getTransaction(hash);
             },
         });
     });

diff --git a/src/testutils/contractController.ts b/src/testutils/contractController.ts
@@ -15,7 +15,7 @@ export class ContractController {
         this.provider = provider;
         this.transactionCompletionAwaiter = new TransactionWatcher({
             getTransaction: async (hash: string) => {
-                return await provider.getTransaction(hash, true);
+                return await provider.getTransaction(hash);
             },
         });
     }

diff --git a/src/testutils/networkProviders.ts b/src/testutils/networkProviders.ts
@@ -33,7 +33,7 @@ export function createMainnetProvider(): INetworkProvider {
 export interface INetworkProvider {
     getNetworkConfig(): Promise<INetworkConfig>;
     getAccount(address: IAddress): Promise<IAccountOnNetwork>;
-    getTransaction(txHash: string, withProcessStatus?: boolean): Promise<TransactionOnNetwork>;
+    getTransaction(txHash: string): Promise<TransactionOnNetwork>;
     getTransactionStatus(txHash: string): Promise<ITransactionStatus>;
     sendTransaction(tx: Transaction): Promise<string>;
     simulateTransaction(tx: Transaction): Promise<any>;

diff --git a/src/tokenManagement/resources.ts b/src/tokenManagement/resources.ts
@@ -50,6 +50,7 @@ export type MintInput = {
     uris: string[];
 };
 export type ManagementInput = { user: IAddress; tokenIdentifier: string };
+export type PausingInput = { tokenIdentifier: string };
 export type LocalBurnInput = { tokenIdentifier: string; supplyToBurn: bigint };
 export type LocalMintInput = { tokenIdentifier: string; supplyToMint: bigint };
 
@@ -59,6 +60,8 @@ export type UpdateQuantityInput = UpdateInput & { quantity: bigint };
 
 export type UpdateInput = { tokenIdentifier: string; tokenNonce: bigint };
 export type BurnRoleGloballyInput = { tokenIdentifier: string };
+export type UpdateTokenIDInput = { tokenIdentifier: string };
+export type ChangeTokenToDynamicInput = { tokenIdentifier: string };
 
 export type RegisterRolesInput = {
     tokenName: string;
@@ -81,12 +84,13 @@ export type RegisterMetaESDTInput = {
 };
 
 export type ModifyRoyaltiesInput = BaseInput & { newRoyalties: bigint };
+export type ModifyCreatorInput = BaseInput;
 
 export type BaseInput = { tokenIdentifier: string; tokenNonce: bigint };
 
 export type SetNewUriInput = BaseInput & { newUris: string[] };
 
-export type UpdateMetadataInput = {
+export type ManageMetadataInput = {
     tokenIdentifier: string;
     tokenNonce: bigint;
     newTokenName?: string;

diff --git a/src/tokenManagement/tokenManagementController.ts b/src/tokenManagement/tokenManagementController.ts
@@ -276,7 +276,7 @@ export class TokenManagementController {
     async createTransactionForPausing(
         sender: IAccount,
         nonce: bigint,
-        options: resources.ManagementInput,
+        options: resources.PausingInput,
     ): Promise<Transaction> {
         const transaction = this.factory.createTransactionForPausing(sender.address, options);
 
@@ -298,7 +298,7 @@ export class TokenManagementController {
     async createTransactionForUnpausing(
         sender: IAccount,
         nonce: bigint,
-        options: resources.ManagementInput,
+        options: resources.PausingInput,
     ): Promise<Transaction> {
         const transaction = this.factory.createTransactionForUnpausing(sender.address, options);
 

diff --git a/src/tokenManagement/tokenManagementTransactionsFactory.ts b/src/tokenManagement/tokenManagementTransactionsFactory.ts
@@ -370,7 +370,7 @@ export class TokenManagementTransactionsFactory {
         }).build();
     }
 
-    createTransactionForPausing(sender: IAddress, options: resources.ManagementInput): Transaction {
+    createTransactionForPausing(sender: IAddress, options: resources.PausingInput): Transaction {
         const dataParts = ["pause", ...this.argSerializer.valuesToStrings([new StringValue(options.tokenIdentifier)])];
 
         return new TransactionBuilder({
@@ -383,7 +383,7 @@ export class TokenManagementTransactionsFactory {
         }).build();
     }
 
-    createTransactionForUnpausing(sender: IAddress, options: resources.ManagementInput): Transaction {
+    createTransactionForUnpausing(sender: IAddress, options: resources.PausingInput): Transaction {
         const dataParts = [
             "unPause",
             ...this.argSerializer.valuesToStrings([new StringValue(options.tokenIdentifier)]),
@@ -598,7 +598,7 @@ export class TokenManagementTransactionsFactory {
         }).build();
     }
 
-    createTransactionForModifyingCreator(sender: IAddress, options: resources.BaseInput): Transaction {
+    createTransactionForModifyingCreator(sender: IAddress, options: resources.ModifyCreatorInput): Transaction {
         const dataParts = [
             "ESDTModifyCreator",
             ...this.argSerializer.valuesToStrings([
@@ -617,7 +617,7 @@ export class TokenManagementTransactionsFactory {
         }).build();
     }
 
-    createTransactionForUpdatingMetadata(sender: IAddress, options: resources.UpdateMetadataInput): Transaction {
+    createTransactionForUpdatingMetadata(sender: IAddress, options: resources.ManageMetadataInput): Transaction {
         const dataParts = [
             "ESDTMetaDataUpdate",
             ...this.argSerializer.valuesToStrings([
@@ -641,7 +641,7 @@ export class TokenManagementTransactionsFactory {
         }).build();
     }
 
-    createTransactionForMetadataRecreate(sender: IAddress, options: resources.UpdateMetadataInput): Transaction {
+    createTransactionForMetadataRecreate(sender: IAddress, options: resources.ManageMetadataInput): Transaction {
         const dataParts = [
             "ESDTMetaDataRecreate",
             ...this.argSerializer.valuesToStrings([
@@ -667,7 +667,7 @@ export class TokenManagementTransactionsFactory {
 
     createTransactionForChangingTokenToDynamic(
         sender: IAddress,
-        options: resources.BurnRoleGloballyInput,
+        options: resources.ChangeTokenToDynamicInput,
     ): Transaction {
         const dataParts = [
             "changeToDynamic",
@@ -684,7 +684,7 @@ export class TokenManagementTransactionsFactory {
         }).build();
     }
 
-    createTransactionForUpdatingTokenId(sender: IAddress, options: resources.BurnRoleGloballyInput): Transaction {
+    createTransactionForUpdatingTokenId(sender: IAddress, options: resources.UpdateTokenIDInput): Transaction {
         const dataParts = [
             "updateTokenID",
             ...this.argSerializer.valuesToStrings([new StringValue(options.tokenIdentifier)]),

diff --git a/src/transaction.local.net.spec.ts b/src/transaction.local.net.spec.ts
@@ -22,7 +22,7 @@ describe("test transaction", function () {
         return new TransactionWatcher(
             {
                 getTransaction: async (hash: string) => {
-                    return await provider.getTransaction(hash, true);
+                    return await provider.getTransaction(hash);
                 },
             },
             { timeoutMilliseconds: 100000 },