diff --git a/.env.example b/.env.example index 6f2e78eb..29bb8d7e 100644 --- a/.env.example +++ b/.env.example @@ -15,7 +15,7 @@ NEXT_PUBLIC_WEB3_URL_PREFIX=https://eth-sepolia.g.alchemy.com/v2/ NEXT_PUBLIC_ALCHEMY_API_KEY="ALCHEMY KEY" NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID="YOUR WALLET CONNECT PROJECT ID" NEXT_PUBLIC_IPFS_ENDPOINT="https://..." -NEXT_PUBLIC_IPFS_API_KEY="..." +NEXT_PUBLIC_PINATA_JWT="..." NEXT_PUBLIC_ETHERSCAN_API_KEY="OPTIONAL: ETHERSCAN API" # PRIVATE (scripts) diff --git a/.github/workflows/app-build.yml b/.github/workflows/app-build.yml index 3eebb8ed..9f23f38c 100644 --- a/.github/workflows/app-build.yml +++ b/.github/workflows/app-build.yml @@ -26,6 +26,6 @@ jobs: NEXT_PUBLIC_ALCHEMY_API_KEY: x NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID: x NEXT_PUBLIC_IPFS_ENDPOINT: https://ipfs/ - NEXT_PUBLIC_IPFS_API_KEY: x + NEXT_PUBLIC_PINATA_JWT: x NEXT_PUBLIC_ETHERSCAN_API_KEY: x NODE_ENV: production diff --git a/bun.lockb b/bun.lockb index 186ae6e7..a1bd5e50 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/constants.ts b/constants.ts index ed4f0321..824a0f21 100644 --- a/constants.ts +++ b/constants.ts @@ -29,7 +29,7 @@ export const PUB_ETHERSCAN_API_KEY = process.env.NEXT_PUBLIC_ETHERSCAN_API_KEY ? export const PUB_WALLET_CONNECT_PROJECT_ID = process.env.NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID ?? ""; export const PUB_IPFS_ENDPOINT = process.env.NEXT_PUBLIC_IPFS_ENDPOINT ?? ""; -export const PUB_IPFS_API_KEY = process.env.NEXT_PUBLIC_IPFS_API_KEY ?? ""; +export const PUB_PINATA_JWT = process.env.NEXT_PUBLIC_PINATA_JWT ?? ""; // General export const PUB_APP_NAME = "Aragonette"; diff --git a/plugins/dualGovernance/pages/new.tsx b/plugins/dualGovernance/pages/new.tsx index e62f57c7..f5f56c61 100644 --- a/plugins/dualGovernance/pages/new.tsx +++ b/plugins/dualGovernance/pages/new.tsx @@ -13,7 +13,7 @@ import { getPlainText } from "@/utils/html"; import { useRouter } from "next/router"; import { Else, ElseIf, If, Then } from "@/components/if"; import { PleaseWaitSpinner } from "@/components/please-wait"; -import { PUB_IPFS_ENDPOINT, PUB_IPFS_API_KEY, PUB_DUAL_GOVERNANCE_PLUGIN_ADDRESS, PUB_CHAIN } from "@/constants"; +import { PUB_IPFS_ENDPOINT, PUB_PINATA_JWT, PUB_DUAL_GOVERNANCE_PLUGIN_ADDRESS, PUB_CHAIN } from "@/constants"; import { ActionCard } from "@/components/actions/action"; enum ActionType { @@ -24,7 +24,7 @@ enum ActionType { const ipfsClient = create({ url: PUB_IPFS_ENDPOINT, - headers: { "X-API-KEY": PUB_IPFS_API_KEY, Accept: "application/json" }, + headers: { "X-API-KEY": PUB_PINATA_JWT, Accept: "application/json" }, }); export default function Create() { diff --git a/plugins/lockToVote/pages/new.tsx b/plugins/lockToVote/pages/new.tsx index bdfcdf59..95023c4b 100644 --- a/plugins/lockToVote/pages/new.tsx +++ b/plugins/lockToVote/pages/new.tsx @@ -13,7 +13,7 @@ import { getPlainText } from "@/utils/html"; import { useRouter } from "next/router"; import { Else, ElseIf, If, Then } from "@/components/if"; import { PleaseWaitSpinner } from "@/components/please-wait"; -import { PUB_IPFS_ENDPOINT, PUB_IPFS_API_KEY, PUB_CHAIN, PUB_LOCK_TO_VOTE_PLUGIN_ADDRESS } from "@/constants"; +import { PUB_IPFS_ENDPOINT, PUB_PINATA_JWT, PUB_CHAIN, PUB_LOCK_TO_VOTE_PLUGIN_ADDRESS } from "@/constants"; import { ActionCard } from "@/components/actions/action"; enum ActionType { @@ -24,7 +24,7 @@ enum ActionType { const ipfsClient = create({ url: PUB_IPFS_ENDPOINT, - headers: { "X-API-KEY": PUB_IPFS_API_KEY, Accept: "application/json" }, + headers: { "X-API-KEY": PUB_PINATA_JWT, Accept: "application/json" }, }); export default function Create() { diff --git a/plugins/tokenVoting/pages/new.tsx b/plugins/tokenVoting/pages/new.tsx index cbf1c660..58821a60 100644 --- a/plugins/tokenVoting/pages/new.tsx +++ b/plugins/tokenVoting/pages/new.tsx @@ -13,7 +13,7 @@ import { getPlainText } from "@/utils/html"; import { useRouter } from "next/router"; import { Else, ElseIf, If, Then } from "@/components/if"; import { PleaseWaitSpinner } from "@/components/please-wait"; -import { PUB_CHAIN, PUB_IPFS_API_KEY, PUB_IPFS_ENDPOINT, PUB_TOKEN_VOTING_PLUGIN_ADDRESS } from "@/constants"; +import { PUB_CHAIN, PUB_PINATA_JWT, PUB_IPFS_ENDPOINT, PUB_TOKEN_VOTING_PLUGIN_ADDRESS } from "@/constants"; import { ActionCard } from "@/components/actions/action"; enum ActionType { @@ -24,7 +24,7 @@ enum ActionType { const ipfsClient = create({ url: PUB_IPFS_ENDPOINT, - headers: { "X-API-KEY": PUB_IPFS_API_KEY, Accept: "application/json" }, + headers: { "X-API-KEY": PUB_PINATA_JWT, Accept: "application/json" }, }); export default function Create() { diff --git a/scripts/deploy.ts b/scripts/deploy.ts index b660c8a5..2a99cb10 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -60,7 +60,7 @@ NEXT_PUBLIC_WEB3_URL_PREFIX=https://eth-${DEPLOYMENT_TARGET_CHAIN_ID}.g.alchemy. NEXT_PUBLIC_ALCHEMY_API_KEY= NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID= NEXT_PUBLIC_IPFS_ENDPOINT= -NEXT_PUBLIC_IPFS_API_KEY= +NEXT_PUBLIC_PINATA_JWT= NEXT_PUBLIC_ETHERSCAN_API_KEY= `; console.log(summary); diff --git a/utils/ipfs.ts b/utils/ipfs.ts index d778dce0..32e99588 100644 --- a/utils/ipfs.ts +++ b/utils/ipfs.ts @@ -1,4 +1,4 @@ -import { PUB_IPFS_ENDPOINT, PUB_IPFS_API_KEY } from "@/constants"; +import { PUB_IPFS_ENDPOINT, PUB_PINATA_JWT } from "@/constants"; import { CID, IPFSHTTPClient } from "ipfs-http-client"; import { Hex, fromHex } from "viem"; @@ -27,7 +27,7 @@ async function fetchFromIPFS(ipfsUri: string): Promise { const response = await fetch(`${PUB_IPFS_ENDPOINT}/cat?arg=${path}`, { method: "POST", headers: { - "X-API-KEY": PUB_IPFS_API_KEY, + "X-API-KEY": PUB_PINATA_JWT, Accept: "application/json", }, signal: controller.signal,