Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Promote dev into master #26

Merged
merged 36 commits into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
1b11bb0
Remove leftover TODOs
duckception Sep 8, 2023
b6637c1
Remove text based locators
duckception Sep 9, 2023
0f25706
Add `Known problems with MetaMask` section
duckception Sep 14, 2023
fc9b2aa
Remove Promise wrap from `cy.setupMetamask()` (#927)
duckception Oct 12, 2023
ebeb450
Fix localized Chrome's extension id (#928)
piotrfrankowski Oct 18, 2023
5ecfd64
Lint
duckception Oct 18, 2023
de76346
Feature/revoke permission to all (#932)
rafal2228 Oct 18, 2023
26422ce
Add `switchNetwork` option to `acceptAccess` function
duckception Nov 3, 2023
34c40ff
Merge branch 'master' into dev
duckception Nov 3, 2023
00abaad
Add new release section to README
duckception Nov 16, 2023
407d240
Use `goerli` for testing (#1082)
duckception Jan 25, 2024
20c8a69
Add `shouldWaitForPopupClosure` option to approvals and txs (#1081)
duckception Jan 25, 2024
9466f3e
Merge branch 'master' into dev
duckception Jan 25, 2024
83c7629
feature: intial setup for integration of keplr
rabi-siddique Feb 28, 2024
61f7a96
chore: use Error object for throwing an error related to invalid exte…
rabi-siddique Feb 28, 2024
3cc4781
Merge pull request #1 from rabi-siddique/rs-integrating-keplr-with-sy…
rabi-siddique Feb 28, 2024
7fd9158
Adding Keplr Interaction for Importing Wallet using Private Key (#2)
rabi-siddique Mar 1, 2024
afdc0a4
Disconnect Wallet Interaction (#7)
rabi-siddique Mar 1, 2024
dbc5fe0
Added Interaction to handle rejection of wallet connection (#8)
frazarshad Mar 4, 2024
f35b3fe
Include code for Offer up Dapp (#10)
frazarshad Mar 4, 2024
fcbd07f
Updates to CI/CD to use Agoric chain and Offer up DApp (#4)
frazarshad Mar 4, 2024
f026bce
Single Screen Interaction, Approve Button Fix and Code Cleanup (#9)
rabi-siddique Mar 4, 2024
1081dc0
Interaction for transaction rejection (#12)
frazarshad Mar 4, 2024
bbff0a4
chore:remove call to switchToKeplrWindow in metamask.js (#16)
rabi-siddique Mar 5, 2024
e6c340e
Abstracting Calls to Switching Extension in Keplr Helper Methods (#13)
rabi-siddique Mar 5, 2024
6e2b5c4
Enable setup of the keplr extension in the beforeAll hook for cypress…
frazarshad Mar 5, 2024
d333345
Add command to switch to another wallet (#18)
frazarshad Mar 5, 2024
fa21859
Getting Wallet Address (#17)
rabi-siddique Mar 5, 2024
d49d84e
Added Interaction to get the value of a certain token (#19)
frazarshad Mar 6, 2024
7d92996
Updates to CI/CD flow (#20)
frazarshad Mar 6, 2024
bd127a3
Adding Selecting Chain Interaction And Flow Improvements (#21)
rabi-siddique Mar 7, 2024
7d67904
feat: included settings to setup npm (#22)
frazarshad Mar 7, 2024
0287cc3
refactor: changed args for setupWallet (#24)
frazarshad Mar 8, 2024
26edc77
Added automatic linting to the repository (#23)
frazarshad Mar 8, 2024
c64a952
Enabled CI Pipeline for NPM deployment (#25)
frazarshad Mar 11, 2024
3ae40a6
Merge branch 'master' into dev
frazarshad Mar 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ coverage
downloads
# dont lint examples
examples
# don't lint the contract folder since we dont want to mess with it
/tools/contract/
22 changes: 22 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,26 @@ module.exports = {
'testing-library/prefer-screen-queries': 0,
'turbo/no-undeclared-env-vars': 0,
},

overrides: [
{
files: ['*.ts', '*.tsx'],
parser: '@typescript-eslint/parser',
plugins: ['@typescript-eslint'],
extends: [
'eslint:recommended',
'prettier',
'plugin:prettier/recommended',
'plugin:import/errors',
'plugin:import/warnings',
'plugin:import/typescript',
'plugin:cypress/recommended',
'plugin:ui-testing/cypress',
'plugin:testing-library/react',
'turbo',
'plugin:@typescript-eslint/eslint-recommended',
'plugin:@typescript-eslint/recommended',
],
},
],
};
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ concurrency:

jobs:
e2e:
if:
github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' ||
github.event_name == 'pull_request'
runs-on: ubuntu-latest

steps:
Expand All @@ -24,6 +21,8 @@ jobs:

- name: Install pnpm
uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # [email protected]
with:
version: 8.15.3

- name: Setup node
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # [email protected]
Expand All @@ -32,9 +31,7 @@ jobs:

- name: Run anvil
run: |
docker-compose -f docker-compose.ci.yml --profile foundry up --build --detach
env:
ANVIL_FORK_URL: ${{ secrets.ANVIL_FORK_URL }}
docker-compose -f docker-compose.yml --profile synpress up --build --detach

- name: Set pnpm cache directory
run: pnpm config set store-dir .pnpm-store
Expand Down Expand Up @@ -79,7 +76,7 @@ jobs:
echo -n "======> remote noVNC URL: "
sleep 5
curl -s localhost:4040/api/tunnels | jq -r .tunnels[0].public_url
pnpm test:e2e:anvil
pnpm test:e2e:keplr
env:
NGROK_AUTH: ${{ secrets.NGROK_AUTH }}
NGROK_BASIC_AUTH: ${{ secrets.NGROK_BASIC_AUTH }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
resolution: ['low', 'medium', 'high']
resolution: ['high']

steps:
- name: Checkout
Expand All @@ -41,7 +41,7 @@ jobs:

- name: Run e2e tests (${{ matrix.resolution }} res)
run: |
docker-compose -f docker-compose.ci.yml --env-file ${{ matrix.resolution }}-res.env --profile synpress --profile foundry up --build --exit-code-from synpress
docker-compose -f docker-compose.ci.keplr.yml --env-file ${{ matrix.resolution }}-res.env --profile synpress up --build --exit-code-from synpress
env:
COMPOSE_DOCKER_CLI_BUILD: 1
DOCKER_BUILDKIT: 1
Expand Down
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pnpm lint-staged
12 changes: 12 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.git
.husky
.github
.env
.dockerignore
.pnpm-store
docker
docs
downloads
images
tests
tools
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/tools/contract/
6 changes: 1 addition & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ RUN apt update && apt install -y nginx

COPY nginx.conf /etc/nginx/sites-available/default

COPY package.json ./
COPY pnpm-lock.yaml ./

FROM base as test
COPY . .

RUN pnpm install --frozen-lockfile --prefer-offline

COPY . .
Loading
Loading