Code review follow up

src/abi/interaction.spec.ts

@@ -65,7 +65,7 @@ describe("test smart contract interactor", function () {
         const hexBar = "4241522d356263303866";
         const hexLKMEX = "4c4b4d45582d616162393130";
         const hexNFT = "4d4f532d623962346232";
-        const hexContractAddress = new Address(contract.getAddress().toBech32()).toHex();
+        const hexContractAddress = contract.getAddress().toHex();
         const hexDummyFunction = "64756d6d79";
 
         // ESDT, single

src/abi/smartContract.ts

@@ -288,8 +288,7 @@ export class SmartContract implements ISmartContract {
      * @param nonce The owner nonce used for the deployment transaction
      */
     static computeAddress(owner: Address, nonce: bigint): Address {
-        const deployer = Address.newFromBech32(owner.toBech32());
         const addressComputer = new AddressComputer();
-        return addressComputer.computeContractAddress(deployer, BigInt(nonce.valueOf()));
+        return addressComputer.computeContractAddress(owner, BigInt(nonce.valueOf()));
     }
 }

src/accountManagement/accountTransactionsFactory.ts

@@ -63,7 +63,7 @@ export class AccountTransactionsFactory {
     createTransactionForSettingGuardian(sender: Address, options: SetGuardianInput): Transaction {
         const dataParts = [
             "SetGuardian",
-            Address.newFromBech32(options.guardianAddress.toBech32()).toHex(),
+            options.guardianAddress.toHex(),
             Buffer.from(options.serviceID).toString("hex"),
         ];
 

src/entrypoints/entrypoints.spec.ts

@@ -42,8 +42,7 @@ describe("TestEntrypoint", () => {
         this.timeout(30000);
         const abi = await loadAbiRegistry("src/testdata/adder.abi.json");
         const sender = Account.newFromPem(alicePem.pemFileText);
-        const accountAddress = new Address(sender.address);
-        sender.nonce = await entrypoint.recallAccountNonce(accountAddress);
+        sender.nonce = await entrypoint.recallAccountNonce(sender.address);
 
         const controller = entrypoint.createSmartContractController(abi);
         const bytecode = readFileSync("src/testdata/adder.wasm");
@@ -63,7 +62,7 @@ describe("TestEntrypoint", () => {
 
         assert.equal(outcome.contracts.length, 1);
 
-        const contractAddress = Address.fromBech32(outcome.contracts[0].address);
+        const contractAddress = Address.newFromBech32(outcome.contracts[0].address);
 
         const executeTransaction = await controller.createTransactionForExecute(
             sender,

src/smartContracts/smartContractTransactionsFactory.ts

@@ -185,7 +185,7 @@ export class SmartContractTransactionsFactory {
         contract: Address;
         newOwner: Address;
     }): Transaction {
-        const dataParts = ["ChangeOwnerAddress", Address.newFromBech32(options.newOwner.toBech32()).toHex()];
+        const dataParts = ["ChangeOwnerAddress", options.newOwner.toHex()];
 
         return new TransactionBuilder({
             config: this.config,

src/utils.codec.ts

@@ -1,6 +1,5 @@
 import BigNumber from "bignumber.js";
 import * as contractsCodecUtils from "./abi/codec/utils";
-import { Address } from "./address";
 
 export function numberToPaddedHex(value: bigint | number | BigNumber.Value) {
     let hexableNumber: { toString(radix?: number): string };
@@ -52,8 +51,3 @@ export function bigIntToHex(value: BigNumber.Value): string {
 
     return contractsCodecUtils.getHexMagnitudeOfBigInt(value);
 }
-
-export function addressToHex(address: Address): string {
-    const buffer = Address.newFromBech32(address.toString()).getPublicKey();
-    return buffer.toString("hex");
-}