diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 772ecde94..70d6cd0c0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,7 +39,8 @@ jobs: - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 with: - fail_ci_if_error: true + # https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954/21 + fail_ci_if_error: false # TODO: Fix or replace bundlemon on CI # - name: Analyze bundle size diff --git a/.github/workflows/mainnet.yml b/.github/workflows/mainnet.yml index 8c42ee19b..ebd936059 100644 --- a/.github/workflows/mainnet.yml +++ b/.github/workflows/mainnet.yml @@ -10,10 +10,10 @@ on: # TODO: Use variables when GH supports it for forks. See https://github.com/orgs/community/discussions/44322 env: - RPC_PROVIDER_URL: "https://mainnet.infura.io/v3/3747007a284045d483c342fb39889a30" + RPC_PROVIDER_URL: "https://eth.llamarpc.com" ENCRYPTOR_PRIVATE_KEY: ${{ secrets.MAINNET_ENCRYPTOR_PRIVATE_KEY }} CONSUMER_PRIVATE_KEY: ${{ secrets.MAINNET_CONSUMER_PRIVATE_KEY }} - RITUAL_ID: "1" + RITUAL_ID: "9" jobs: networks: diff --git a/demos/taco-demo/src/App.tsx b/demos/taco-demo/src/App.tsx index 118099df1..7267f25ed 100644 --- a/demos/taco-demo/src/App.tsx +++ b/demos/taco-demo/src/App.tsx @@ -17,6 +17,12 @@ import { Encrypt } from './Encrypt'; import { Spinner } from './Spinner'; import { DEFAULT_DOMAIN, DEFAULT_RITUAL_ID } from './config'; +const chainIdForDomain = { + [domains.DEVNET]: 80002, + [domains.TESTNET]: 80002, + [domains.MAINNET]: 137, +}; + export default function App() { const { activateBrowserWallet, deactivate, account, switchNetwork } = useEthers(); @@ -30,10 +36,12 @@ export default function App() { const [ritualId, setRitualId] = useState(DEFAULT_RITUAL_ID); const [domain, setDomain] = useState(DEFAULT_DOMAIN); + const chainId = chainIdForDomain[domain]; + useEffect(() => { initialize(); - switchNetwork(80002); - }, []); + switchNetwork(chainId); + }, [chainId]); const encryptMessage = async (message: string) => { if (!condition) { @@ -41,7 +49,7 @@ export default function App() { } setLoading(true); - await switchNetwork(80002); + await switchNetwork(chainId); const provider = new ethers.providers.Web3Provider(window.ethereum); const encryptedMessage = await encrypt( diff --git a/demos/taco-nft-demo/src/App.tsx b/demos/taco-nft-demo/src/App.tsx index e27e1847f..6302e4ccc 100644 --- a/demos/taco-nft-demo/src/App.tsx +++ b/demos/taco-nft-demo/src/App.tsx @@ -17,6 +17,12 @@ import { NFTConditionBuilder } from './NFTConditionBuilder'; import { Spinner } from './Spinner'; import { DEFAULT_DOMAIN, DEFAULT_RITUAL_ID } from './config'; +const chainIdForDomain = { + [domains.DEVNET]: 80002, + [domains.TESTNET]: 80002, + [domains.MAINNET]: 137, +}; + export default function App() { const { activateBrowserWallet, deactivate, account, switchNetwork } = useEthers(); @@ -30,9 +36,13 @@ export default function App() { const [ritualId, setRitualId] = useState(DEFAULT_RITUAL_ID); const [domain, setDomain] = useState(DEFAULT_DOMAIN); + const chainId = chainIdForDomain[domain]; + useEffect(() => { initialize(); - }, []); + switchNetwork(chainId); + }, [chainId]); + const encryptMessage = async (message: string) => { if (!condition) { @@ -40,7 +50,7 @@ export default function App() { } setLoading(true); - await switchNetwork(80002); + await switchNetwork(chainId); const provider = new ethers.providers.Web3Provider(window.ethereum); const encryptedMessage = await encrypt( diff --git a/packages/shared/package.json b/packages/shared/package.json index 87de6029e..cf752954a 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@nucypher/shared", - "version": "0.2.1", + "version": "0.2.2", "keywords": [ "pre", "taco", diff --git a/packages/taco/package.json b/packages/taco/package.json index c9e242e58..525936f52 100644 --- a/packages/taco/package.json +++ b/packages/taco/package.json @@ -1,6 +1,6 @@ { "name": "@nucypher/taco", - "version": "0.2.4", + "version": "0.2.5", "keywords": [ "taco", "threshold",