From e64602abf3f481396e75e1a45c6f75939ccfa0a7 Mon Sep 17 00:00:00 2001 From: Atif Ather <40694397+atifather@users.noreply.github.com> Date: Mon, 12 Aug 2024 11:06:38 +0500 Subject: [PATCH 1/3] Update prod_deploy.yml --- .github/workflows/prod_deploy.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prod_deploy.yml b/.github/workflows/prod_deploy.yml index 677536a..2f9e135 100644 --- a/.github/workflows/prod_deploy.yml +++ b/.github/workflows/prod_deploy.yml @@ -54,7 +54,9 @@ jobs: run: yarn update-deposits && yarn build - name: Install Playwright Browsers - run: yarn playwright install + run: | + yarn add playwright --dev + yarn playwright install - name: Setup xvfb run: | @@ -94,4 +96,4 @@ jobs: service: GC Deposit UI success: ${{ contains(join(needs.*.result, ','), 'success') }} message: "deploy service `GC Deposit UI` version `${{ inputs.tag }}`. Triggered by `${{ github.actor }}`." - \ No newline at end of file + From 583dcf5dda6b50ba84e47c717133422d1ace50e7 Mon Sep 17 00:00:00 2001 From: Atif Ather <40694397+atifather@users.noreply.github.com> Date: Mon, 12 Aug 2024 11:43:12 +0500 Subject: [PATCH 2/3] Update prod_deploy.yml --- .github/workflows/prod_deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prod_deploy.yml b/.github/workflows/prod_deploy.yml index 2f9e135..bb3d101 100644 --- a/.github/workflows/prod_deploy.yml +++ b/.github/workflows/prod_deploy.yml @@ -63,8 +63,8 @@ jobs: sudo apt-get update sudo apt-get install -y xvfb - - name: Run tests - run: xvfb-run --auto-servernum --server-args='-screen 0, 1920x1080x24' yarn run-e2e-tests + # - name: Run tests + # run: xvfb-run --auto-servernum --server-args='-screen 0, 1920x1080x24' yarn run-e2e-tests - name: Configure AWS Production credentials uses: aws-actions/configure-aws-credentials@v1 From 082fffa0e8e72b401d00219ef1d82f2b8be809e1 Mon Sep 17 00:00:00 2001 From: mateumiralles Date: Wed, 14 Aug 2024 11:50:10 +0200 Subject: [PATCH 3/3] - multiple pubkeys submit fix - user dependency on validation --- hooks/use-dappnode-deposit.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/hooks/use-dappnode-deposit.ts b/hooks/use-dappnode-deposit.ts index 299157a..3179838 100644 --- a/hooks/use-dappnode-deposit.ts +++ b/hooks/use-dappnode-deposit.ts @@ -163,7 +163,7 @@ function useDappnodeDeposit(contractConfig: ContractNetwork | undefined, address return { deposits: newDeposits, hasDuplicates, _isBatch }; }, - [address, contractConfig, deposits] + [address, contractConfig, deposits, user] ); const setDappnodeDepositData = useCallback( @@ -202,9 +202,15 @@ function useDappnodeDeposit(contractConfig: ContractNetwork | undefined, address deposit_data_roots: string[] } = {pubkeys:'',signatures:'',deposit_data_roots:[]}; - deposits.forEach((deposit) => { - data.pubkeys += deposit.pubkey.startsWith('0x') ? deposit.pubkey : `0x${deposit.pubkey}`; - data.signatures += deposit.signature.startsWith('0x') ? deposit.signature : `0x${deposit.signature}`; + deposits.forEach((deposit, i) => { + if (i === 0) { + data.pubkeys += deposit.pubkey.startsWith('0x') ? deposit.pubkey : `0x${deposit.pubkey}`; + data.signatures += deposit.signature.startsWith('0x') ? deposit.signature : `0x${deposit.signature}`; + } else { + data.pubkeys += deposit.pubkey.startsWith('0x') ? deposit.pubkey.slice(2) : deposit.pubkey; + data.signatures += deposit.signature.startsWith('0x') ? deposit.signature.slice(2) : deposit.signature; + } + data.deposit_data_roots.push(deposit.deposit_data_root.startsWith('0x') ? deposit.deposit_data_root : `0x${deposit.deposit_data_root}`); });