diff --git a/.github/workflows/deploy_test_dapp.yml b/.github/workflows/deploy_test_dapp.yml index 83686419fd..1860065633 100644 --- a/.github/workflows/deploy_test_dapp.yml +++ b/.github/workflows/deploy_test_dapp.yml @@ -4,7 +4,6 @@ on: push: branches: [master] pull_request: - branches: [master] concurrency: group: ${{ github.workflow }}-${{ github.ref }}-${{ github.ref != 'refs/heads/master' || github.run_number }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dfaf4baccb..4b879164be 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,8 +43,8 @@ jobs: strategy: matrix: include: - - testnet: oxfordnet - testnet_uppercase: OXFORDNET + - testnet: parisnet + testnet_uppercase: PARISNET steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 diff --git a/apps/taquito-test-dapp/package.json b/apps/taquito-test-dapp/package.json index bf4f665881..73f89b191b 100644 --- a/apps/taquito-test-dapp/package.json +++ b/apps/taquito-test-dapp/package.json @@ -1,7 +1,7 @@ { "name": "taquito-test-dapp-vite", "private": true, - "version": "19.2.1", + "version": "20.0.0", "type": "module", "scripts": { "dev": "vite", @@ -26,10 +26,10 @@ "dependencies": { "@airgap/beacon-sdk": "^4.2.2", "@airgap/beacon-types": "^4.2.2", - "@taquito/beacon-wallet": "^19.2.1", - "@taquito/core": "^19.2.1", - "@taquito/taquito": "^19.2.1", - "@taquito/utils": "^19.2.1", + "@taquito/beacon-wallet": "^20.0.0", + "@taquito/core": "^20.0.0", + "@taquito/taquito": "^20.0.0", + "@taquito/utils": "^20.0.0", "buffer": "^6.0.3", "svelte-select": "^5.7.0", "vite-compatible-readable-stream": "^3.6.1" diff --git a/apps/taquito-test-dapp/src/App.svelte b/apps/taquito-test-dapp/src/App.svelte index e2aa3be199..c3447e11a2 100644 --- a/apps/taquito-test-dapp/src/App.svelte +++ b/apps/taquito-test-dapp/src/App.svelte @@ -14,6 +14,7 @@ let availableNetworks = [ { value: "ghostnet", label: "Ghostnet", group: "current testnets" }, { value: "oxfordnet", label: "Oxfordnet", group: "current testnets" }, + { value: "parisnet", label: "Parisnet", group: "current testnets" }, { value: "mainnet", label: "Mainnet", group: "mainnet" }, { value: "dailynet", label: "Dailynet", group: "other testnets" }, { value: "weeklynet", label: "Weeklynet", group: "other testnets" }, @@ -42,6 +43,9 @@ case "oxfordnet": store.updateNetworkType(NetworkType.OXFORDNET); break; + case "parisnet": + store.updateNetworkType(NetworkType.PARISNET); + break; case "custom": //TODO: input custom RPC URL showCustomNetworkInput = true; diff --git a/apps/taquito-test-dapp/src/config.ts b/apps/taquito-test-dapp/src/config.ts index 10a5d59c6a..2f01fa7cbc 100644 --- a/apps/taquito-test-dapp/src/config.ts +++ b/apps/taquito-test-dapp/src/config.ts @@ -1,11 +1,12 @@ import { NetworkType } from '@airgap/beacon-types'; -export type SupportedNetworks = NetworkType.OXFORDNET | NetworkType.GHOSTNET | NetworkType.MAINNET | NetworkType.CUSTOM; +export type SupportedNetworks = NetworkType.PARISNET | NetworkType.OXFORDNET | NetworkType.GHOSTNET | NetworkType.MAINNET | NetworkType.CUSTOM; const rpcUrls: Record = { [NetworkType.MAINNET]: "https://mainnet.ecadinfra.com", [NetworkType.GHOSTNET]: "https://ghostnet.ecadinfra.com/", [NetworkType.OXFORDNET]: "https://oxfordnet.ecadinfra.com/", + [NetworkType.PARISNET]: "https://rpc.parisnet.teztnets.com/", [NetworkType.CUSTOM]: "https://ghostnet.ecadinfra.com/", }; @@ -21,6 +22,8 @@ export const getTzKtUrl = (networkType: SupportedNetworks): string | undefined = return "https://ghostnet.tzkt.io"; case NetworkType.OXFORDNET: return "https://oxfordnet.tzkt.io"; + case NetworkType.PARISNET: + return "https://parisnet.tzkt.io"; case NetworkType.CUSTOM: return undefined; } @@ -35,4 +38,5 @@ export const contractAddress = { mainnet: "KT1ShtH2zCrKMuWGRejEd6RAcnePwxBQeMAN", ghostnet: "KT1QKmcNBcfzVTXG2kBcE6XqXtEuYYUzMcT5", oxfordnet: "KT1GYx1KDhMQt2GJEztRh8EyYxJUPM6fnAMM", + parisnet: "KT1E43cQefjM8fq7B5pEJFJoGbRmuNibDoBC", }; diff --git a/apps/taquito-test-dapp/src/lib/TestContainer.svelte b/apps/taquito-test-dapp/src/lib/TestContainer.svelte index d748260eef..89c466b26f 100644 --- a/apps/taquito-test-dapp/src/lib/TestContainer.svelte +++ b/apps/taquito-test-dapp/src/lib/TestContainer.svelte @@ -11,7 +11,7 @@ let loading = false; let success: boolean | undefined; let opHash = ""; - let input = { text: "", fee: 400, storageLimit: 400, gasLimit: 1320, amount: 0, address: "" }; + let input = { text: "", fee: 400, storageLimit: 400, gasLimit: 1320, amount: 0, address: "", delegate: "", stake: 0, unstake: 0 }; let testResult: { id: string; title: string; body: any }; const run = async () => { @@ -28,6 +28,9 @@ test.id === "sign-payload-and-send" || test.id === "sign-failingNoop" || test.id === "verify-signature" || + test.id === "set-delegate" || + test.id === "stake" || + test.id === "unstake" || test.id === "send-tez-to-etherlink" || test.id === "set-transaction-limits" ) { @@ -303,6 +306,27 @@ bind:value={input.text} /> + {:else if test.inputRequired && test.inputType === "delegate"} +
+ +
+ {:else if test.inputRequired && test.inputType === "stake"} +
+ +
+ {:else if test.inputRequired && test.inputType === "unstake"} +
+ +
{:else if test.inputRequired && test.inputType === "etherlink"}