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.

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

Staging #250

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file not shown.
9 changes: 5 additions & 4 deletions Implementations/Subgraph/daostar/build/subgraph.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ features:
templates:
- name: EIP4824Registration
kind: ethereum/contract
network: arbitrum-one
network: sepolia
source:
abi: EIP4824Registration
mapping:
Expand All @@ -32,14 +32,15 @@ templates:
entities:
- DAOMetadata
abis: []
network: sepolia
dataSources:
- kind: ethereum
name: EIP4824Index
network: arbitrum-one
network: sepolia
source:
abi: EIP4824Index
address: "0x18CbB356cd64193b1a0CA49911fc72CB3D02a5E4"
startBlock: 171329384
address: "0xD4d107a57fddaF6A21d7D7d1411602F943e08caA"
startBlock: 6602301
mapping:
kind: ethereum/events
apiVersion: 0.0.7
Expand Down
6 changes: 6 additions & 0 deletions Implementations/Subgraph/daostar/networks.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
"startBlock": 8901481
}
},
"sepolia": {
"EIP4824Index": {
"address": "0xD4d107a57fddaF6A21d7D7d1411602F943e08caA",
"startBlock": 6602301
}
},
"gnosis": {
"EIP4824Index": {
"address": "0x8180cbfBFFe59F54BF3Ea5d7DdbaE1232e2bB298",
Expand Down
7 changes: 4 additions & 3 deletions Implementations/Subgraph/daostar/src/getChainId.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,10 @@ export function getChainId(): BigInt {
chainId = BigInt.fromI32(84531);
} else if (network == "base") {
chainId = BigInt.fromI32(8453);
} else if (network == "zksync-era") {
chainId = BigInt.fromI32(324);
} else {
} else if (network == "sepolia") {
chainId = BigInt.fromI32(11155111);
}
else {
throw new Error(`No chainName for network ${network}`);
}

Expand Down
14 changes: 6 additions & 8 deletions Implementations/Subgraph/daostar/subgraph.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ schema:
file: ./schema.graphql
features:
- ipfsOnEthereumContracts

templates:
- name: EIP4824Registration
kind: ethereum/contract
network: arbitrum-one
network: sepolia
source:
abi: EIP4824Registration
mapping:
Expand All @@ -23,7 +22,6 @@ templates:
eventHandlers:
- event: DAOURIUpdate(address,string)
handler: handleNewURI

- name: DAOMetadataTemplate
kind: file/ipfs
mapping:
Expand All @@ -33,16 +31,16 @@ templates:
handler: handleDAOMetadata
entities:
- DAOMetadata
abis: [] # No ABIs required for file data sources

abis: []
network: sepolia
dataSources:
- kind: ethereum
name: EIP4824Index
network: arbitrum-one
network: sepolia
source:
abi: EIP4824Index
address: "0x18CbB356cd64193b1a0CA49911fc72CB3D02a5E4"
startBlock: 171329384
address: "0xD4d107a57fddaF6A21d7D7d1411602F943e08caA"
startBlock: 6602301
mapping:
kind: ethereum/events
apiVersion: 0.0.7
Expand Down
68 changes: 68 additions & 0 deletions contracts/broadcast/Deploy.s.sol/11155111/run-1725051407.json

Large diffs are not rendered by default.

150 changes: 150 additions & 0 deletions contracts/broadcast/Deploy.s.sol/11155111/run-1725051688.json

Large diffs are not rendered by default.

150 changes: 150 additions & 0 deletions contracts/broadcast/Deploy.s.sol/11155111/run-latest.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"main": "index.js",
"scripts": {
"build": "forge build",
"deploy:sepolia": "EVM_NETWORK=sepolia bash -c 'source .env && forge script script/Deploy.s.sol --fork-url $SEPOLIA_RPC_URL --private-key $PRIVATE_KEY --verify --etherscan-api-key $ETHERSCAN_KEY -vvvv --broadcast'",
"deploy:goerli": "EVM_NETWORK=goerli source .env && forge script script/Deploy.s.sol --fork-url $GOERLI_RPC_URL --private-key $PRIVATE_KEY --verify --etherscan-api-key $ETHERSCAN_KEY -vvvv --broadcast",
"deploy:gnosis": "EVM_NETWORK=gnosis source .env && forge script script/Deploy.s.sol --fork-url $GNOSIS_RPC_URL --private-key $PRIVATE_KEY --verify --etherscan-api-key $ETHERSCAN_KEY -vvvv --broadcast",
"deploy:mainnet": "EVM_NETWORK=mainnet source .env && forge script script/Deploy.s.sol --fork-url $MAINNET_RPC_URL --private-key $PRIVATE_KEY --verify --etherscan-api-key $ETHERSCAN_KEY -vvvv --broadcast",
Expand Down
5 changes: 5 additions & 0 deletions contracts/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 22 additions & 3 deletions daostar-website/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,18 @@ console.log(mainnetData);
data: arbitrumData,
} = arbitrumRes;

const sepoliaRes = useQuery(queries.SUNRISE_REGISTRATIONS, {
context: { apiName: "sepolia" },
variables: { registrationNetworkId: "sepolia" },
fetchPolicy: 'network-only',
});

const {
loading: sepoliaLoading,
error: sepoliaError,
data: sepoliaData,
} = sepoliaRes;

const EASOptimismSepoliaiRes = useQuery(queries.ATTESTATIONS_BY_SCHEMA, {
context: { apiName: "easOptimismSepolia" },
variables: {
Expand Down Expand Up @@ -307,7 +319,8 @@ console.log(mainnetData);
chapelError ||
optimismError ||
mainnetv0Error ||
arbitrumError
arbitrumError ||
sepoliaError
) {
console.error("Mainnet Error " + error);
console.error("Mainnet v0 Error " + mainnetv0Error);
Expand All @@ -317,6 +330,8 @@ console.log(mainnetData);
console.error("Chapel Error" + chapelError);
console.error("Optimism Error" + optimismError);
console.error("Arbitrum Error" + arbitrumError);
console.error("Sepolia Error" + sepoliaError);


}
if (
Expand All @@ -327,7 +342,8 @@ console.log(mainnetData);
arbitrumGoerliLoading ||
chapelLoading ||
optimismLoading ||
arbitrumLoading
arbitrumLoading ||
sepoliaLoading
)
return "loading...";
const mainnetRegistrations =
Expand All @@ -346,6 +362,8 @@ console.log(mainnetData);
arbitrumGoerliData?.registrationNetwork?.registrations || [];
const arbitrumRegistrations =
arbitrumData?.registrationNetwork?.registrations || [];
const sepoliaRegistrations =
sepoliaData?.registrationNetwork?.registrations || [];
const chapelRegistrations =
chapelData?.registrationNetwork?.registrations || [];

Expand Down Expand Up @@ -386,7 +404,8 @@ console.log(mainnetData);
const sunriseNetworkInstances = gnosisRegistrations.concat(
chapelRegistrations,
mainnetRegistrations,
arbitrumRegistrations
arbitrumRegistrations,
sepoliaRegistrations
);

console.log({
Expand Down
9 changes: 4 additions & 5 deletions daostar-website/src/components/ExplorePage/ExplorePage.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ const NetworkButtons = [
{ text: "Optimism-Goerli", filter: "optimism-goerli" },
{ text: "Osmosis", filter: "osmosis" },
{ text: "Stargaze", filter: "stargaze" },
{ text: "Sepolia", filter: "sepolia" },
{ text: "EAS", filter: "easAttestations" },
{ text: "ENS", filter: "ensTextRecords" },
];
Expand Down Expand Up @@ -106,10 +107,7 @@ const ExplorePage = ({
const filteredRegistrationsSunrise = (sunriseInstances, networkFilterValue = "") => {
return sunriseInstances
.filter((registration) => {
// Exclude the specific DAO address
// if (registration.daoAddress.toLowerCase() === "0xdeb9e5915db81011c549799a9ea37ede4d72efba") {
// return false;
// }


// Check if the daoURI is in a valid format
if (!isValidDaoURI(registration.daoURI)) {
Expand Down Expand Up @@ -152,7 +150,8 @@ console.log("gnnosis", registrationInstances
return filteredRegistrationsSunrise(sunriseNetworkInstances, "gnosis")
case "ethereum":
return filteredRegistrationsSunrise(sunriseNetworkInstances, "mainnet")

case "sepolia":
return filteredRegistrationsSunrise(sunriseNetworkInstances, "sepolia")
case "optimism":
return registrationInstances
.filter((reg) => NetworkFilterRegistrations(reg, "optimism"))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
const registrationIdsToFilter = [
'0x170b1eb094571c154ff822145b8cdb3afb852b4c', // Testnet bnb bruno
'0x4e656b8859548075cd4d922809129bfda9920b8e', // Testnet arb goerli
'0xfe0c8cfa51eed09259eb4926df24ba26dda6230d', // Lyra demo without issuer uri
'0xdad5df58927e1743a6f88ec280d6b3fb264b05d5', // Kiwi dao demo without issuer uri
'0xa5aa339314402edb5db68c7e3d3a526cf0245bf9', // Kiwi dao
'0xdeddc6cdd12d9a514b7af9d51df9a3e46be2ddef', // Test dao
'0x9189687fa2b38b944629cee8a7ebc84214793c2a',
'0xf9b8d94e1d78ad8cb1d7a4800e88dacf0fd5dcc9', // Test DAO
'0xe6d0d13d7558655c1c64bc92ea0e892cb69c2d19', // Orchid DAO
'0x5f7d4e12665b9d0fc57df2b9a1e1da56e8e057f2', // Orchid DAO
'0x24da46eb403dc54ff2e7442d88c745ff1991b07d', // Orchid DAO
'0x80e645e468966981fe279a8ee67600695e3a7976', // CatToys DAO
'0x8028dfdb40f0d78c1ed34be025eb779fd280c86b', // Orchid DAO
'0x86d1d7a482376ad3d5ec322486824dd74c405048', // Orchid DAO
'0xad3d3158c3032a131e43eb94cc4dbcbefe14a9cf', // Orchid DAO
'0xae6af870b06c20c5a9eccf55b4b5b95b01c5364c', // Orchid DAO
'0xeedfdd3c75674977efc43cfda3aba6662cd5c64e', // Test PR 166
'0xc12f8d46d4865d64d3878091d22df3d7b8f6aef4', // Lily DAO
'0xa8d9c7f125a438b6028eb91f75c2ae6981ccd4d9', // Test OP Mainnet
'0xa88ff2b0f100b3fdbb1e52dd951d3bc64c5fceab', // Lily DAO OP Goerlu
'0x0fcd80c7c504d56eb9b0fcd5d342352b99580b23', // Lodestar duplicate registration
'0xc521f2511c9294f80ed6b0607c59a760534118e4',
'0x8e3eb988fe9dae0e294c833388af8bd64fcbeec3',
'0x40010a93fc9df1620d0e4f26fed2b4b6f28c4318',
'0x0d4e9fd02ea0f12682d33046b27a04b07f509a39',
'0xefe11221fa97c360ac9ed08f89794189609de5fd',
'0xb824c5ef343a3a9ef550fb118614ac29b94a474c',
'0xa8b2C1Cc93eFC40e3cE0A0b2001a624aB58bcFc2',
'0x996841B3FD6CaB01393cF77Bb581B502Db6a096B',
'0x3D9B8904BfB0b8eB76Ca928209c247C0e074dE91',
'0x36f6Ed6D3765588e86aab4E06E9903E4E9138135',
'0x07D0704A5f0730eF812AB091c56E0e127a6502b6'
// '0x170b1eb094571c154ff822145b8cdb3afb852b4c', // Testnet bnb bruno
// '0x4e656b8859548075cd4d922809129bfda9920b8e', // Testnet arb goerli
// '0xfe0c8cfa51eed09259eb4926df24ba26dda6230d', // Lyra demo without issuer uri
// '0xdad5df58927e1743a6f88ec280d6b3fb264b05d5', // Kiwi dao demo without issuer uri
// '0xa5aa339314402edb5db68c7e3d3a526cf0245bf9', // Kiwi dao
// '0xdeddc6cdd12d9a514b7af9d51df9a3e46be2ddef', // Test dao
// '0x9189687fa2b38b944629cee8a7ebc84214793c2a',
// '0xf9b8d94e1d78ad8cb1d7a4800e88dacf0fd5dcc9', // Test DAO
// '0xe6d0d13d7558655c1c64bc92ea0e892cb69c2d19', // Orchid DAO
// '0x5f7d4e12665b9d0fc57df2b9a1e1da56e8e057f2', // Orchid DAO
// '0x24da46eb403dc54ff2e7442d88c745ff1991b07d', // Orchid DAO
// '0x80e645e468966981fe279a8ee67600695e3a7976', // CatToys DAO
// '0x8028dfdb40f0d78c1ed34be025eb779fd280c86b', // Orchid DAO
// '0x86d1d7a482376ad3d5ec322486824dd74c405048', // Orchid DAO
// '0xad3d3158c3032a131e43eb94cc4dbcbefe14a9cf', // Orchid DAO
// '0xae6af870b06c20c5a9eccf55b4b5b95b01c5364c', // Orchid DAO
// '0xeedfdd3c75674977efc43cfda3aba6662cd5c64e', // Test PR 166
// '0xc12f8d46d4865d64d3878091d22df3d7b8f6aef4', // Lily DAO
// '0xa8d9c7f125a438b6028eb91f75c2ae6981ccd4d9', // Test OP Mainnet
// '0xa88ff2b0f100b3fdbb1e52dd951d3bc64c5fceab', // Lily DAO OP Goerlu
// '0x0fcd80c7c504d56eb9b0fcd5d342352b99580b23', // Lodestar duplicate registration
// '0xc521f2511c9294f80ed6b0607c59a760534118e4',
// '0x8e3eb988fe9dae0e294c833388af8bd64fcbeec3',
// '0x40010a93fc9df1620d0e4f26fed2b4b6f28c4318',
// '0x0d4e9fd02ea0f12682d33046b27a04b07f509a39',
// '0xefe11221fa97c360ac9ed08f89794189609de5fd',
// '0xb824c5ef343a3a9ef550fb118614ac29b94a474c',
// '0xa8b2C1Cc93eFC40e3cE0A0b2001a624aB58bcFc2',
// '0x996841B3FD6CaB01393cF77Bb581B502Db6a096B',
// '0x3D9B8904BfB0b8eB76Ca928209c247C0e074dE91',
// '0x36f6Ed6D3765588e86aab4E06E9903E4E9138135',
// '0x07D0704A5f0730eF812AB091c56E0e127a6502b6'
];

export const filterEASbyId = [
'0xd8a6a62285604abb37ace1c3b08d3b9ddae177f59c29ead274c98d5384711e01', //test 2
'0x1cd5d9364748a56b1ccd75357af1c94f0572391b283c44737b95e6843d1122b6', //test DAO
'0xd537e5fc1d8bfae5b1bf8d3c2fcd996b6193115d5e76c97d7eac95819e675f16', //hh
'0x3ca06ddfe224e6f7ce00dbc4ff3a64ed6c52b2400ef3d633c68c88f99933df04', //daoui
'0xdfb41aff88b8570cfa6da02083d280915bb090d8ed5e195ce7b40b98d88667ab', //test
'0x8e095714505cca969a448d7ecf3a27f6ac4e37c1eef4816ca4787ae04f98f6c9', //test
'0x8499c5e98f9abb3646514ca9a6fad3d9f94363c899e33db875df484ee5546037', //test
'0x49fdb1a98528ab64f9eb739ae1fe639bef92db4ac50897ee8e0839b5e4263978', //strike team dao 5
// '0xd8a6a62285604abb37ace1c3b08d3b9ddae177f59c29ead274c98d5384711e01', //test 2
// '0x1cd5d9364748a56b1ccd75357af1c94f0572391b283c44737b95e6843d1122b6', //test DAO
// '0xd537e5fc1d8bfae5b1bf8d3c2fcd996b6193115d5e76c97d7eac95819e675f16', //hh
// '0x3ca06ddfe224e6f7ce00dbc4ff3a64ed6c52b2400ef3d633c68c88f99933df04', //daoui
// '0xdfb41aff88b8570cfa6da02083d280915bb090d8ed5e195ce7b40b98d88667ab', //test
// '0x8e095714505cca969a448d7ecf3a27f6ac4e37c1eef4816ca4787ae04f98f6c9', //test
// '0x8499c5e98f9abb3646514ca9a6fad3d9f94363c899e33db875df484ee5546037', //test
// '0x49fdb1a98528ab64f9eb739ae1fe639bef92db4ac50897ee8e0839b5e4263978', //strike team dao 5
]; // List of names to exclude


Expand Down
1 change: 1 addition & 0 deletions daostar-website/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ const client = new ApolloClient({
goerli: `https://api.thegraph.com/subgraphs/name/ipatka/daostar-goerli`,
optimismGoerli: `https://api.thegraph.com/subgraphs/name/rashmi-278/daostar-optimism-goerli`,
mainnet: `https://api.studio.thegraph.com/query/74263/daostar-mainnet/version/latest`,
sepolia: `https://api.studio.thegraph.com/query/74263/daostar-sepolia/version/latest`,
gnosis: `https://api.studio.thegraph.com/query/74263/daostar-gnosis/version/latest`,
arbitrumGoerli: `https://api.thegraph.com/subgraphs/name/rashmi-278/daostar-arbitrum-goerli`,
chapel:`https://api.studio.thegraph.com/query/74263/daostar-bnb-bruno/version/latest`, //bnb-bruno
Expand Down