status-im
/
dagger-contracts
mirror of https://github.com/status-im/dagger-contracts.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove contract aliasing; doesn't work 

Contract aliasing (specifying a fixed address for a
contract) doesn't work. We're now echoing the
addresses of the deployed contracts instead.
This commit is contained in:
Mark Spanbroek 2024-01-25 15:00:46 +01:00 committed by markspanbroek
parent c7b18af7cd
commit 31bbd702c2
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
deploy/marketplace.js
View File

@ -1,9 +1,5 @@
const { loadZkeyHash } = require("../verifier/verifier.js")
// hardcoded addresses when deploying on local network
const MARKETPLACE_REAL = "0x59b670e9fA9D0A427751Af201D676719a970857b"
const MARKETPLACE_TEST = "0xfacadee9fA9D0A427751Af201D676719a9facade"
// marketplace configuration
const CONFIGURATION = {
collateral: {
@ -25,14 +21,8 @@ async function mine256blocks({ network, ethers }) {
}
}
async function aliasContract(address, alias) {
if (address !== alias) {
await ethers.provider.send("hardhat_setCode", [alias, address])
}
}
// deploys a marketplace with a real Groth16 verifier
async function deployMarketplace({ network, deployments, getNamedAccounts }) {
async function deployMarketplace({ deployments, getNamedAccounts }) {
const token = await deployments.get("TestToken")
const verifier = await deployments.get("Groth16Verifier")
const zkeyHash = loadZkeyHash(network.name)
@ -40,9 +30,9 @@ async function deployMarketplace({ network, deployments, getNamedAccounts }) {
const args = [configuration, token.address, verifier.address]
const { deployer: from } = await getNamedAccounts()
const marketplace = await deployments.deploy("Marketplace", { args, from })
if (network.tags.local) {
await aliasContract(marketplace.address, MARKETPLACE_REAL)
}
console.log("Deployed Marketplace with Groth16 Verifier at:")
console.log(marketplace.address)
console.log()
}
// deploys a marketplace with a testing verifier
@ -59,7 +49,9 @@ async function deployTestMarketplace({
const args = [configuration, token.address, verifier.address]
const { deployer: from } = await getNamedAccounts()
const marketplace = await deployments.deploy("Marketplace", { args, from })
await aliasContract(marketplace.address, MARKETPLACE_TEST)
console.log("Deployed Marketplace with Test Verifier at:")
console.log(marketplace.address)
console.log()
}
}

1
deploy/token.js
View File

@ -13,6 +13,7 @@ module.exports = async ({ deployments, getNamedAccounts, getUnnamedAccounts, net
const transaction = await token.mint(account, MINTED_TOKENS, { from: deployer })
await transaction.wait()
}
console.log()
}
}