Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gas weekly and blob cumulative #371

Merged
merged 6 commits into from
Mar 19, 2025
Merged

gas weekly and blob cumulative #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5450863
move things around
sunnyvempati Mar 18, 2025
71e4c71
fix version
sunnyvempati Mar 18, 2025
581897e
fix preset
sunnyvempati Mar 18, 2025
db829ae
outputs
sunnyvempati Mar 18, 2025
113aa8c
Merge branch 'main' into organize-cannonfiles
noahlitvin Mar 19, 2025
702ad88
Merge branch 'main' into organize-cannonfiles
noahlitvin Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ node_modules
.env
**/.turbo

packages/protocol/deployments/13370
packages/protocol/deployments/test
packages/protocol/deployments/outputs/13370
packages/protocol/deployments/outputs/test

# Hardhat files
**/cache
Expand Down
8 changes: 4 additions & 4 deletions packages/api/src/fixtures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,16 @@ const addMarketYinYang = async (
resource = RESOURCES[0] // Default to Ethereum Gas
) => {
const yin = await safeRequire(
`@/protocol/deployments/${chainId}${suffix || ''}/FoilYin.json`
`@/protocol/deployments/outputs/${chainId}${suffix || ''}/FoilYin.json`
);
const yang = await safeRequire(
`@/protocol/deployments/${chainId}${suffix || ''}/FoilYang.json`
`@/protocol/deployments/outputs/${chainId}${suffix || ''}/FoilYang.json`
);
const yinVault = await safeRequire(
`@/protocol/deployments/${chainId}${suffix || ''}/VaultYin.json`
`@/protocol/deployments/outputs/${chainId}${suffix || ''}/VaultYin.json`
);
const yangVault = await safeRequire(
`@/protocol/deployments/${chainId}${suffix || ''}/VaultYang.json`
`@/protocol/deployments/outputs/${chainId}${suffix || ''}/VaultYang.json`
);

if (yin && yang && yinVault && yangVault) {
Expand Down
10 changes: 5 additions & 5 deletions packages/app/src/components/useFoilDeployment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ const useFoilDeployment = (chainId?: number) => {
const loadFoilData = async () => {
try {
const foil = await import(
`@/protocol/deployments/${chainId}/FoilYin.json`
`@/protocol/deployments/outputs/${chainId}/FoilYin.json`
);
const foilYinVault = await import(
`@/protocol/deployments/${chainId}/VaultYin.json`
`@/protocol/deployments/outputs/${chainId}/VaultYin.json`
);
const foilYangVault = await import(
`@/protocol/deployments/${chainId}/VaultYang.json`
`@/protocol/deployments/outputs/${chainId}/VaultYang.json`
);
const foilYinBlobVault = await import(
`@/protocol/deployments/${chainId}-blobs/VaultYin.json`
`@/protocol/deployments/outputs/${chainId}-blobs/VaultYin.json`
);
const foilYangBlobVault = await import(
`@/protocol/deployments/${chainId}-blobs/VaultYang.json`
`@/protocol/deployments/outputs/${chainId}-blobs/VaultYang.json`
);
setFoilData(foil);
setFoilVaultData({
Expand Down
Loading