Skip to content

Commit

Permalink
chore(gha): buidl test green local
Browse files Browse the repository at this point in the history
  • Loading branch information
bitbeckers committed Jun 7, 2024
1 parent 473cc51 commit 21954d5
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
19 changes: 8 additions & 11 deletions contracts/tasks/deploy-marketplace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const USDT: TokenAddressType = {
const getTokenAddresses = (network: string) => {
return {
wethAddress: WETH[network],
usdcAddress: USDCe[network],
usdceAddress: USDCe[network],
daiAddress: DAI[network],
usdtAddress: USDT[network],
};
Expand Down Expand Up @@ -109,7 +109,7 @@ task("deploy-marketplace", "Deploy marketplace contracts and verify")
//TODO multichain support
const { ethers, network, run, viem } = hre;
const create2Address = "0x0000000000ffe8b47b3e2130213b802212439497";
const { wethAddress, usdcAddress, daiAddress, usdtAddress } = getTokenAddresses(network.name);
const { wethAddress, usdceAddress, daiAddress, usdtAddress } = getTokenAddresses(network.name);

const publicClient = await viem.getPublicClient();
const [deployer] = await viem.getWalletClients();
Expand All @@ -122,8 +122,8 @@ task("deploy-marketplace", "Deploy marketplace contracts and verify")
// 10_000 = 100%
// Sepolia admin Safe = sep:0x4f37308832c6eFE5A74737955cBa96257d76De17
const marketplaceParameters = {
owner: "0x4f37308832c6eFE5A74737955cBa96257d76De17",
protocolFeeRecipient: "0x4f37308832c6eFE5A74737955cBa96257d76De17",
owner: "0x4f37308832c6eFE5A74737955cBa96257d76De17", // hc admin safe
protocolFeeRecipient: "0x4f37308832c6eFE5A74737955cBa96257d76De17", // hc fee safe
standardProtocolFeeBP: 100,
minTotalFeeBp: 100,
maxProtocolFeeBp: 200,
Expand Down Expand Up @@ -208,7 +208,7 @@ task("deploy-marketplace", "Deploy marketplace contracts and verify")
];

// Create2 Transfermanager
const transferManagerArgs = [deployer.account?.address];
const transferManagerArgs = [deployer.account?.address]; // initial owner is deployer
const transferManagerCreate2 = await getCreate2Address(
deployer,
create2Address,
Expand All @@ -235,7 +235,7 @@ task("deploy-marketplace", "Deploy marketplace contracts and verify")

// Create2 HypercertsExchange
const hypercertsExchangeArgs = [
deployer.account?.address,
deployer.account?.address, // initial owner is deployer
protocolFeeRecipientCreate2.address,
transferManagerCreate2.address,
wethAddress,
Expand Down Expand Up @@ -436,7 +436,7 @@ task("deploy-marketplace", "Deploy marketplace contracts and verify")
// Update currency status for accepted tokens
await allowCurrency("0x0000000000000000000000000000000000000000", "ETH");
await allowCurrency(wethAddress, "WETH");
await allowCurrency(usdcAddress, "USDC");
await allowCurrency(usdceAddress, "USDCe");
await allowCurrency(daiAddress, "DAI");
await allowCurrency(usdtAddress, "USDT");

Expand Down Expand Up @@ -575,10 +575,7 @@ task("deploy-marketplace", "Deploy marketplace contracts and verify")
}

async function allowCurrency(tokenAddress: string, name: string) {
const hash = await hypercertsExchangeInstance.write.updateCurrencyStatus([
"0x0000000000000000000000000000000000000000",
true,
]);
const hash = await hypercertsExchangeInstance.write.updateCurrencyStatus([tokenAddress, true]);
const receipt = await publicClient.waitForTransactionReceipt({
hash,
});
Expand Down
2 changes: 1 addition & 1 deletion graph/tests/.latest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "0.6.0",
"timestamp": 1710361554698
"timestamp": 1717751587080
}
3 changes: 2 additions & 1 deletion sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@
"clean": "rm -rf ./dist",
"prebuild": "pnpm clean",
"prepack": "pnpm build",
"test": "vitest",
"test": "vitest run",
"test:watch": "vitest --watch",
"types:json": "pnpm json2ts -i './src/resources/schema/' -o 'src/types' --cwd './src/resources/schema'"
}
}

0 comments on commit 21954d5

Please sign in to comment.