From a66e7eafa6723b4852850716e47c25076c4d2fdc Mon Sep 17 00:00:00 2001 From: stadolf Date: Fri, 31 May 2024 16:36:19 +0200 Subject: [PATCH] uses alchemy subgraphs fixes the crowdsale dune dashboard uses latest foundry version on CI Signed-off-by: stadolf --- .github/workflows/test.yml | 2 -- README.md | 14 +++++++------- periphery/dune/cumulative_bids.sql | 1 + subgraph/package.json | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 598d76e8..0d9d4f43 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,8 +16,6 @@ jobs: - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 - with: - version: nightly-a117fbfa41edbaa1618ed099d78d65727bff4790 - name: Use Node.js 20 uses: actions/setup-node@v4 diff --git a/README.md b/README.md index 88a1c02a..2ea98796 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ IP-NFTs allow their users to tokenize intellectual property. This repo contains #### Subgraph -API: https://api.thegraph.com/subgraphs/name/moleculeprotocol/ip-nft-mainnet -Playground: https://api.thegraph.com/subgraphs/name/moleculeprotocol/ip-nft-mainnet/graphql +API: https://subgraph.satsuma-prod.com/742d8952ab24/molecule--4039244/ip-nft-mainnet/api +Playground: https://subgraph.satsuma-prod.com/molecule--4039244/ip-nft-mainnet/playground tokenizer implementation 1.2: 0xE8701330F196FeFe415b28dAA767AB076F42557A tokenizer implementation 1.1: 0x9C70FA8c87D7e94Fd63eeCCcA657D5c4224a36f3 @@ -28,7 +28,7 @@ ipnft implementation 2.4: 0x6B179Dffac5E190c670176606f552cB792847f80 #### Defender Relayer -signs off minting requests from our side: 0x3D30452c48F2448764d5819a9A2b684Ae2CC5AcF +Deprecated after migrating to Defender 2 (was 0x3D30452c48F2448764d5819a9A2b684Ae2CC5AcF). We're using a key signoff with 0x8626c6293B5101E5E534B5B60F411a37294D8cBE. --- @@ -46,14 +46,14 @@ signs off minting requests from our side: 0x3D30452c48F2448764d5819a9A2b684Ae2CC #### Subgraphs -on Satsuma, Tech Account +on Satsuma, Techprod Account -API: https://subgraph.satsuma-prod.com/techs-team--4017766/moleculexyz-ipnft-sepolia/version/v0.0.1/api -Playground: https://subgraph.satsuma-prod.com/techs-team--4017766/moleculexyz-ipnft-sepolia/playground +API: https://subgraph.satsuma-prod.com/742d8952ab24/molecule--4039244/ip-nft-sepolia/api +Playground: https://subgraph.satsuma-prod.com/molecule--4039244/ip-nft-sepolia/playground #### Defender Relayer -signs off minting requests from our side: 0xd7B298c9fB0377124d01D4E826d9D5beFB7CD6FE +Deprecated after migrating to Defender 2 (was 0xd7B298c9fB0377124d01D4E826d9D5beFB7CD6FE). We're using a key signoff with 0x8626c6293B5101E5E534B5B60F411a37294D8cBE. #### Tokens diff --git a/periphery/dune/cumulative_bids.sql b/periphery/dune/cumulative_bids.sql index 8933c4c6..3b1d43a2 100644 --- a/periphery/dune/cumulative_bids.sql +++ b/periphery/dune/cumulative_bids.sql @@ -6,6 +6,7 @@ FROM LEFT JOIN ipnft_{{chain}}.StakedLockingCrowdSale_evt_Bid AS previous_bids ON previous_bids.evt_block_time <= bids.evt_block_time + AND previous_bids.saleId = cast('{{saleId}}' as uint256) WHERE bids.saleId = cast('{{saleId}}' as uint256) GROUP BY diff --git a/subgraph/package.json b/subgraph/package.json index 393d6320..8d8b7c85 100644 --- a/subgraph/package.json +++ b/subgraph/package.json @@ -8,8 +8,8 @@ "prepare:local": "mustache config/local.js subgraph.template.yaml > subgraph.yaml", "prepare:sepolia": "mustache config/sepolia.js subgraph.template.yaml > subgraph.yaml", "prepare:mainnet": "mustache config/mainnet.js subgraph.template.yaml > subgraph.yaml", - "deploy:sepolia": "env-cmd -x -f ../.env graph deploy moleculexyz-ipnft-sepolia --version-label v0.0.1 --node https://subgraphs.alchemy.com/api/subgraphs/deploy --ipfs https://ipfs.satsuma.xyz --deploy-key \\$SATSUMA_DEPLOY_KEY", - "deploy": "graph deploy --product hosted-service moleculeprotocol/ip-nft-mainnet", + "deploy:sepolia": "env-cmd -x -f ../.env graph deploy ip-nft-sepolia --version-label 1.0.0 --node https://subgraphs.alchemy.com/api/subgraphs/deploy --ipfs https://ipfs.satsuma.xyz --deploy-key \\$SATSUMA_DEPLOY_KEY", + "deploy:mainnet": "env-cmd -x -f ../.env graph deploy ip-nft-mainnet --version-label 1.0.0 --node https://subgraphs.alchemy.com/api/subgraphs/deploy --ipfs https://ipfs.satsuma.xyz --deploy-key \\$SATSUMA_DEPLOY_KEY", "create:local": "graph create --node http://localhost:8020/ moleculeprotocol/ipnft-subgraph", "remove:local": "graph remove --node http://localhost:8020/ moleculeprotocol/ipnft-subgraph", "deploy:local": "graph deploy --node http://localhost:8020/ --ipfs http://localhost:5001 moleculeprotocol/ipnft-subgraph",