diff --git a/ignition/modules/endian.js b/ignition/modules/endian.js index 8ff44fe..e6247de 100644 --- a/ignition/modules/endian.js +++ b/ignition/modules/endian.js @@ -1,15 +1,9 @@ const { buildModule } = require("@nomicfoundation/hardhat-ignition/modules") module.exports = buildModule("Endian", (m) => { - const deployer = m.getAccount(0) + const endian = m.contract("Endian", [], {}) - const endian = m.contract("Endian", [], { - from: deployer, - }) - - const testEndian = m.contract("TestEndian", [], { - from: deployer, - }) + const testEndian = m.contract("TestEndian", [], {}) return { endian, testEndian } }) diff --git a/ignition/modules/marketplace.js b/ignition/modules/marketplace.js index 8cf9ac0..e0798eb 100644 --- a/ignition/modules/marketplace.js +++ b/ignition/modules/marketplace.js @@ -12,8 +12,6 @@ function getDefaultConfig() { } module.exports = buildModule("Marketplace", (m) => { - const deployer = m.getAccount(0) - const { token } = m.useModule(TokenModule) const { verifier } = m.useModule(VerifierModule) const configuration = m.getParameter("configuration", getDefaultConfig()) @@ -21,9 +19,7 @@ module.exports = buildModule("Marketplace", (m) => { const marketplace = m.contract( "Marketplace", [configuration, token, verifier], - { - from: deployer, - }, + {}, ) let testMarketplace @@ -35,9 +31,7 @@ module.exports = buildModule("Marketplace", (m) => { testMarketplace = m.contract( "TestMarketplace", [configuration, token, testVerifier], - { - from: deployer, - }, + {}, ) } diff --git a/ignition/modules/periods.js b/ignition/modules/periods.js index 5207434..c3a352a 100644 --- a/ignition/modules/periods.js +++ b/ignition/modules/periods.js @@ -1,12 +1,9 @@ const { buildModule } = require("@nomicfoundation/hardhat-ignition/modules") module.exports = buildModule("Periods", (m) => { - const deployer = m.getAccount(0) const secondsPerPeriod = m.getParameter("secondsPerPeriod", 0) - const periods = m.contract("Periods", [secondsPerPeriod], { - from: deployer, - }) + const periods = m.contract("Periods", [secondsPerPeriod], {}) return { periods } }) diff --git a/ignition/modules/proofs.js b/ignition/modules/proofs.js index 1162a3d..bc71762 100644 --- a/ignition/modules/proofs.js +++ b/ignition/modules/proofs.js @@ -2,14 +2,10 @@ const { buildModule } = require("@nomicfoundation/hardhat-ignition/modules") const VerifierModule = require("./verifier.js") module.exports = buildModule("Proofs", (m) => { - const deployer = m.getAccount(0) - const { verifier } = m.useModule(VerifierModule) const configuration = m.getParameter("configuration", null) - const testProofs = m.contract("TestProofs", [configuration, verifier], { - from: deployer, - }) + const testProofs = m.contract("TestProofs", [configuration, verifier], {}) return { testProofs } }) diff --git a/ignition/modules/slot-reservations.js b/ignition/modules/slot-reservations.js index 4abeecc..d795381 100644 --- a/ignition/modules/slot-reservations.js +++ b/ignition/modules/slot-reservations.js @@ -1,16 +1,12 @@ const { buildModule } = require("@nomicfoundation/hardhat-ignition/modules") module.exports = buildModule("SlotReservations", (m) => { - const deployer = m.getAccount(0) - const configuration = m.getParameter("configuration", null) const testSlotReservations = m.contract( "TestSlotReservations", [configuration], - { - from: deployer, - } + {}, ) return { testSlotReservations } diff --git a/ignition/modules/token.js b/ignition/modules/token.js index 62fc6e7..ed4348c 100644 --- a/ignition/modules/token.js +++ b/ignition/modules/token.js @@ -4,8 +4,6 @@ const MAX_ACCOUNTS = 20 const MINTED_TOKENS = 1_000_000_000_000_000n module.exports = buildModule("Token", (m) => { - const deployer = m.getAccount(0) - let token if (process.env.TOKEN_ADDRESS) { @@ -15,9 +13,7 @@ module.exports = buildModule("Token", (m) => { ) token = m.contractAt("TestToken", process.env.TOKEN_ADDRESS, {}) } else { - token = m.contract("TestToken", [], { - from: deployer, - }) + token = m.contract("TestToken", [], {}) } const config = hre.network.config @@ -26,7 +22,6 @@ module.exports = buildModule("Token", (m) => { for (let i = 0; i < MAX_ACCOUNTS; i++) { const account = m.getAccount(i) m.call(token, "mint", [account, MINTED_TOKENS], { - from: deployer, id: `SendingTestTokens_${i}`, }) } diff --git a/ignition/modules/vault.js b/ignition/modules/vault.js index 779d577..9a35a73 100644 --- a/ignition/modules/vault.js +++ b/ignition/modules/vault.js @@ -2,12 +2,9 @@ const { buildModule } = require("@nomicfoundation/hardhat-ignition/modules") const TokenModule = require("./token.js") module.exports = buildModule("Vault", (m) => { - const deployer = m.getAccount(0) const { token } = m.useModule(TokenModule) - const vault = m.contract("Vault", [token], { - from: deployer, - }) + const vault = m.contract("Vault", [token], {}) return { vault, token } }) diff --git a/ignition/modules/verifier.js b/ignition/modules/verifier.js index 4fc49fb..181e707 100644 --- a/ignition/modules/verifier.js +++ b/ignition/modules/verifier.js @@ -2,16 +2,10 @@ const { buildModule } = require("@nomicfoundation/hardhat-ignition/modules") const { loadVerificationKey } = require("../../verifier/verifier.js") module.exports = buildModule("Verifier", (m) => { - const deployer = m.getAccount(0) - const verificationKey = loadVerificationKey(hre.network.name) - const verifier = m.contract("Groth16Verifier", [verificationKey], { - from: deployer, - }) + const verifier = m.contract("Groth16Verifier", [verificationKey], {}) - const testVerifier = m.contract("TestVerifier", [], { - from: deployer, - }) + const testVerifier = m.contract("TestVerifier", [], {}) return { verifier, testVerifier } })