diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml index 93152ecb2..71136a758 100644 --- a/.github/workflows/npm.yml +++ b/.github/workflows/npm.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: node: ['18.x'] - version: ['latest', 'mainnet', 'devnet', 'testnet'] + version: ['latest', 'mainnet', 'devnet'] steps: - uses: pnpm/action-setup@v4 diff --git a/.github/workflows/tapir.yml b/.github/workflows/tapir.yml deleted file mode 100644 index c0ac2096f..000000000 --- a/.github/workflows/tapir.yml +++ /dev/null @@ -1,57 +0,0 @@ -name: '🔎 Tapir Testnet Example' - -on: - schedule: - - cron: '0 * * * *' # Every hour - pull_request: - branches: - - main - workflow_dispatch: - -# TODO: Use variables when GH supports it for forks. See https://github.com/orgs/community/discussions/44322 -env: - RPC_PROVIDER_URL: 'https://rpc-amoy.polygon.technology' - ENCRYPTOR_PRIVATE_KEY: '0x900edb9e8214b2353f82aa195e915128f419a92cfb8bbc0f4784f10ef4112b86' - CONSUMER_PRIVATE_KEY: '0xf307e165339cb5deb2b8ec59c31a5c0a957b8e8453ce7fe8a19d9a4c8acf36d4' - RITUAL_ID: '6' - -jobs: - networks: - name: - '🔎 Tapir Testnet Example on Node ${{ matrix.node }} and ${{ matrix.os }}' - - runs-on: ${{ matrix.os }} - strategy: - matrix: - node: ['18.x'] - os: [ubuntu-latest] - - steps: - - uses: actions/checkout@v6 - - - uses: pnpm/action-setup@v4 - with: - version: 9 - - - uses: actions/setup-node@v6 - with: - node-version: ${{ matrix.node }} - cache: 'pnpm' - - - name: Install dependencies - working-directory: ./examples/taco/nodejs - run: pnpm install - - - name: Setup environment - working-directory: ./examples/taco/nodejs - # TODO: Use variables when GH supports it for forks. See https://github.com/orgs/community/discussions/44322 - run: | - echo RPC_PROVIDER_URL=$RPC_PROVIDER_URL > .env - echo ENCRYPTOR_PRIVATE_KEY=$ENCRYPTOR_PRIVATE_KEY >> .env - echo CONSUMER_PRIVATE_KEY=$CONSUMER_PRIVATE_KEY >> .env - echo RITUAL_ID=$RITUAL_ID >> .env - echo DOMAIN=tapir >> .env - - - name: Run taco/nodejs script - working-directory: ./examples/taco/nodejs - run: pnpm start diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c0888d438..dafc561b2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -69,7 +69,6 @@ View resulting published versions: 4. Tag latest release of `@nucypher/taco` for various domains where appropriate: ```bash npm dist-tag add @nucypher/taco@ devnet -npm dist-tag add @nucypher/taco@ testnet npm dist-tag add @nucypher/taco@ mainnet ``` diff --git a/demos/taco-demo/src/App.tsx b/demos/taco-demo/src/App.tsx index a21aa1491..a040fe4b8 100644 --- a/demos/taco-demo/src/App.tsx +++ b/demos/taco-demo/src/App.tsx @@ -24,7 +24,6 @@ import { downloadData, getWebIrys, uploadData } from './irys'; const chainIdForDomain = { [domains.DEVNET]: 80002, - [domains.TESTNET]: 80002, [domains.MAINNET]: 137, }; diff --git a/demos/taco-demo/src/config.ts b/demos/taco-demo/src/config.ts index 447351b00..116196da8 100644 --- a/demos/taco-demo/src/config.ts +++ b/demos/taco-demo/src/config.ts @@ -1,7 +1,9 @@ import { domains } from '@nucypher/taco'; -export const DEFAULT_RITUAL_ID = parseInt(process.env.DEFAULT_RITUAL_ID || '6'); -export const DEFAULT_DOMAIN = process.env.DEFAULT_DOMAIN || domains.TESTNET; +export const DEFAULT_RITUAL_ID = parseInt( + process.env.DEFAULT_RITUAL_ID || '27', +); +export const DEFAULT_DOMAIN = process.env.DEFAULT_DOMAIN || domains.DEVNET; // Node 2 is free export const IRYS_NODE_URL = diff --git a/demos/taco-nft-demo/src/App.tsx b/demos/taco-nft-demo/src/App.tsx index 80900fae3..e330a64b8 100644 --- a/demos/taco-nft-demo/src/App.tsx +++ b/demos/taco-nft-demo/src/App.tsx @@ -22,7 +22,6 @@ import { Spinner } from './Spinner'; const chainIdForDomain = { [domains.DEVNET]: 80002, - [domains.TESTNET]: 80002, [domains.MAINNET]: 137, }; diff --git a/demos/taco-nft-demo/src/config.ts b/demos/taco-nft-demo/src/config.ts index 8bf304a7d..346cd80e6 100644 --- a/demos/taco-nft-demo/src/config.ts +++ b/demos/taco-nft-demo/src/config.ts @@ -1,4 +1,6 @@ import { domains } from '@nucypher/taco'; -export const DEFAULT_RITUAL_ID = parseInt(process.env.DEFAULT_RITUAL_ID || '6'); -export const DEFAULT_DOMAIN = process.env.DEFAULT_DOMAIN || domains.TESTNET; +export const DEFAULT_RITUAL_ID = parseInt( + process.env.DEFAULT_RITUAL_ID || '27', +); +export const DEFAULT_DOMAIN = process.env.DEFAULT_DOMAIN || domains.DEVNET; diff --git a/examples/pre/nextjs/src/app/page.tsx b/examples/pre/nextjs/src/app/page.tsx index eb3b4e4bc..186850e9c 100644 --- a/examples/pre/nextjs/src/app/page.tsx +++ b/examples/pre/nextjs/src/app/page.tsx @@ -108,8 +108,8 @@ function App() { const policy = await alice.grant( provider, provider.getSigner(), - domains.TESTNET, - await getPorterUri(domains.TESTNET), + domains.DEVNET, + await getPorterUri(domains.DEVNET), policyParams, ); diff --git a/examples/pre/nodejs/src/index.ts b/examples/pre/nodejs/src/index.ts index 3bd080bf1..e207ca89e 100644 --- a/examples/pre/nodejs/src/index.ts +++ b/examples/pre/nodejs/src/index.ts @@ -72,8 +72,8 @@ const runExample = async () => { const policy = await alice.grant( provider, signer, - domains.TESTNET, - await getPorterUri(domains.TESTNET), + domains.DEVNET, + await getPorterUri(domains.DEVNET), policyParams, ); diff --git a/examples/pre/react/src/App.tsx b/examples/pre/react/src/App.tsx index add7e5179..39b8618ad 100644 --- a/examples/pre/react/src/App.tsx +++ b/examples/pre/react/src/App.tsx @@ -105,8 +105,8 @@ function App() { const policy = await alice.grant( provider, provider.getSigner(), - domains.TESTNET, - await getPorterUri(domains.TESTNET), + domains.DEVNET, + await getPorterUri(domains.DEVNET), policyParams, ); diff --git a/examples/pre/webpack-5/src/index.ts b/examples/pre/webpack-5/src/index.ts index b1a3b1a3b..f2560a737 100644 --- a/examples/pre/webpack-5/src/index.ts +++ b/examples/pre/webpack-5/src/index.ts @@ -81,8 +81,8 @@ const runExample = async () => { const policy = await alice.grant( provider, provider.getSigner(), - domains.TESTNET, - await getPorterUri(domains.TESTNET), + domains.DEVNET, + await getPorterUri(domains.DEVNET), policyParams, ); diff --git a/examples/taco/nextjs/src/app/page.tsx b/examples/taco/nextjs/src/app/page.tsx index 13fcc2ba0..00bd801da 100644 --- a/examples/taco/nextjs/src/app/page.tsx +++ b/examples/taco/nextjs/src/app/page.tsx @@ -10,8 +10,8 @@ import useTaco from '../hooks/useTaco'; // eslint-disable-next-line @typescript-eslint/no-explicit-any declare const window: any; -const ritualId = 6; // Replace with your own ritual ID -const domain = domains.TESTNET; +const ritualId = 27; // Replace with your own ritual ID +const domain = domains.DEVNET; function App() { const [provider, setProvider] = useState< diff --git a/examples/taco/nodejs/.env.example b/examples/taco/nodejs/.env.example index 7c961a23f..7c02a0f53 100644 --- a/examples/taco/nodejs/.env.example +++ b/examples/taco/nodejs/.env.example @@ -5,5 +5,5 @@ RPC_PROVIDER_URL=https://rpc-amoy.polygon.technology # We provide here some defaults, but we encourage you to choose your own. ENCRYPTOR_PRIVATE_KEY=0x900edb9e8214b2353f82aa195e915128f419a92cfb8bbc0f4784f10ef4112b86 CONSUMER_PRIVATE_KEY=0xf307e165339cb5deb2b8ec59c31a5c0a957b8e8453ce7fe8a19d9a4c8acf36d4 -RITUAL_ID=6 -DOMAIN=tapir +RITUAL_ID=27 +DOMAIN=lynx diff --git a/examples/taco/nodejs/src/index.ts b/examples/taco/nodejs/src/index.ts index ef4550ab5..981d6b5c2 100644 --- a/examples/taco/nodejs/src/index.ts +++ b/examples/taco/nodejs/src/index.ts @@ -35,12 +35,11 @@ if (!consumerPrivateKey) { throw new Error('CONSUMER_PRIVATE_KEY is not set.'); } -const domain = process.env.DOMAIN || domains.TESTNET; -const ritualId = parseInt(process.env.RITUAL_ID || '6'); +const domain = process.env.DOMAIN || domains.DEVNET; +const ritualId = parseInt(process.env.RITUAL_ID || '27'); const provider = new ethers.providers.JsonRpcProvider(rpcProviderUrl); const CHAIN_ID_FOR_DOMAIN = { [domains.MAINNET]: 137, - [domains.TESTNET]: 80002, [domains.DEVNET]: 80002, }; const chainId = CHAIN_ID_FOR_DOMAIN[domain]; diff --git a/examples/taco/react/src/App.tsx b/examples/taco/react/src/App.tsx index dd5161822..ac04c2ac8 100644 --- a/examples/taco/react/src/App.tsx +++ b/examples/taco/react/src/App.tsx @@ -9,8 +9,8 @@ import useTaco from './hooks/useTaco'; // eslint-disable-next-line @typescript-eslint/no-explicit-any declare const window: any; -const ritualId = 6; // Replace with your own ritual ID -const domain = domains.TESTNET; +const ritualId = 27; // Replace with your own ritual ID +const domain = domains.DEVNET; function App() { const [provider, setProvider] = useState< diff --git a/examples/taco/webpack-5/src/index.ts b/examples/taco/webpack-5/src/index.ts index 433aaddca..c108035af 100644 --- a/examples/taco/webpack-5/src/index.ts +++ b/examples/taco/webpack-5/src/index.ts @@ -20,8 +20,8 @@ declare const window: any; const runExample = async () => { await initialize(); - const ritualId = 6; // Replace with your own ritual ID - const domain = domains.TESTNET; + const ritualId = 27; // Replace with your own ritual ID + const domain = domains.DEVNET; const provider = new ethers.providers.Web3Provider(window.ethereum!, 'any'); await provider.send('eth_requestAccounts', []); diff --git a/packages/shared/src/porter.ts b/packages/shared/src/porter.ts index a71239bc8..fe65f170b 100644 --- a/packages/shared/src/porter.ts +++ b/packages/shared/src/porter.ts @@ -20,7 +20,6 @@ import { fromBase64, fromHexString, toBase64, toHexString } from './utils'; const defaultPorterUri: Record = { mainnet: 'https://porter.nucypher.io', - tapir: 'https://porter-tapir.nucypher.io', lynx: 'https://porter-lynx.nucypher.io', }; @@ -32,7 +31,6 @@ export type PorterURISourceResponse = Record; export const domains: Record = { DEVNET: 'lynx', - TESTNET: 'tapir', MAINNET: 'mainnet', }; diff --git a/packages/taco/README.md b/packages/taco/README.md index 0fd7afc6f..09b12c5e0 100644 --- a/packages/taco/README.md +++ b/packages/taco/README.md @@ -4,7 +4,7 @@ ## Supported `taco` versions -To use `taco`, you need to connect with a proper network: `mainnet`, `testnet`, or `devnet`. You can find a proper version for each network in the [npmjs.com package tags](https://www.npmjs.com/package/@nucypher/taco?activeTab=versions). +To use `taco`, you need to connect with a proper network: `mainnet` or `devnet`. You can find a proper version for each network in the [npmjs.com package tags](https://www.npmjs.com/package/@nucypher/taco?activeTab=versions). Visit [our documentation](https://docs.taco.build/taco-integration/) to learn more. @@ -37,7 +37,7 @@ const message = 'my secret message'; const messageKit = await encrypt( web3Provider, - domains.TESTNET, + domains.DEVNET, message, ownsNFT, ritualId, @@ -58,7 +58,7 @@ const web3Provider = new ethers.providers.Web3Provider(window.ethereum); const decryptedMessage = await decrypt( web3Provider, - domains.TESTNET, + domains.DEVNET, messageKit, web3Provider.getSigner(), ); diff --git a/packages/taco/examples/encrypt-decrypt.ts b/packages/taco/examples/encrypt-decrypt.ts index 1ee53f3e9..abd6d742f 100644 --- a/packages/taco/examples/encrypt-decrypt.ts +++ b/packages/taco/examples/encrypt-decrypt.ts @@ -15,7 +15,7 @@ import { toBytes, } from '../src'; -const ritualId = 1; +const ritualId = 27; const run = async () => { // The data encryptor runs this part @@ -32,7 +32,7 @@ const run = async () => { }); const messageKit = await encrypt( web3Provider, - domains.TESTNET, + domains.DEVNET, message, ownsNFT, ritualId, @@ -57,7 +57,7 @@ const run = async () => { conditionContext.addAuthProvider(USER_ADDRESS_PARAM_DEFAULT, authProvider); const decryptedMessage = await decrypt( web3Provider, - domains.TESTNET, + domains.DEVNET, messageKit, conditionContext, );