Skip to content

Commit

Permalink
Production Deploy (#14063)
Browse files Browse the repository at this point in the history
* Manual deploy as of commit:2c21135eb2fe5f56bad82c282c07c36ee49b9877

* fix(unlock-app): fixing decent serialization

* fix(unlock-app): fix paywall modal when closed (#14065)

fix for paywall modal when closed

* fix(unlock-app): fix network switch (#14064)

* fix network switch

* remove unwanted console log

* cross-chain parse gas values properly

* recreate provider proplery

* cross chain: delete unwanted gas values

* fix(unlock-app): use eip1193 when recreating wallet provider for wallet connect (#14068)

* use eip1193 to init provider on wallet connect

* clarify provider flow

---------

Co-authored-by: Clément Renaud <clement@unlock-protocol.com>
  • Loading branch information
julien51 and clemsos committed Jun 18, 2024
1 parent dc411cb commit c025689
Show file tree
Hide file tree
Showing 434 changed files with 8,470 additions and 16,838 deletions.
3 changes: 2 additions & 1 deletion .clabot
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@
"blahkheart",
"TylerSehr",
"ClockRide",
"Tguntenaar"
"Tguntenaar",
"iMac7"
],
"message": "Thank you for your pull request and welcome to Unlock! We require contributors to sign our [Contributor License Agreement](https://github.com/unlock-protocol/unlock/blob/master/CLA.txt), and we don't seem to have the users {{usersWithoutCLA}} on file. \nIn order for us to review and merge your code, please open _another_ pull request with a single modification: your github username added to the file `.clabot`.\nThank you! "
}
16 changes: 7 additions & 9 deletions .github/workflows/import-blog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,20 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install dependencies
run: npm install

- name: Set up Node.js
uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '20'
node-version: 20

- name: Prepare repo
run: yarn && yarn build

- name: Run RSS Feed Script
run: node rss_feed.js

- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v6
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: 'Add new blog posts'
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,6 @@ yarn-error.log

# log files
nohup.out

#locksmith
locksmith/uploads
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:experimental

ARG NODE_VERSION=20.12.2-bullseye
ARG NODE_VERSION=20.14.0-bullseye
# the graph cli binary does not work with bookworm which is the default for Node 20 images. Once the graph-cli binary has been updated to not use https://www.npmjs.com/package/binary-install-raw we can use bookworm.

###################################################################
Expand Down
5 changes: 0 additions & 5 deletions docker/development/eth-node/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
const rulesToIgnore = []

module.exports = {
extends: ['@unlock-protocol/eslint-config'],
rules: {
...rulesToIgnore.reduce((obj, rule) => ({ ...obj, [rule]: 'off' }), {}),
},
}
1 change: 0 additions & 1 deletion docker/development/eth-node/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# local deps
packages
networks.json

# contracts
Expand Down
15 changes: 0 additions & 15 deletions docker/development/eth-node/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,6 @@

A standalone hardhat node, fully provisioned for Unlock local development and integration testing

## Prepare for Unlock dev

### Copy packages

As this folder is NOT integrated into the yarn monorepo setup, we need to manually copy packages
from the monorepo `packages` folder into a `./packages` in this directory.

```shell
# from the monorepo root folder
source ./scripts/start/envs.sh

# copy the packages
./scripts/start/copy-eth-node-packages.sh
```

### Start an ETH node

```
Expand Down
19 changes: 7 additions & 12 deletions docker/development/eth-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,22 @@
"description": "Simple ETH node for development purposes",
"private": true,
"scripts": {
"packages:clean": "yarn packages --parallel run clean",
"packages:build": "yarn packages --topological-dev run build",
"build": "yarn packages:clean && yarn packages:build",
"build": "",
"lint:fix": "yarn lint --fix",
"lint": "eslint --resolve-plugins-relative-to ../eslint-config --ext .tsx,.ts,.js scripts/",
"packages": "yarn workspaces foreach --recursive --from '{@unlock-protocol/types,@unlock-protocol/core,@unlock-protocol/eslint-config,@unlock-protocol/hardhat-helpers,@unlock-protocol/express,@unlock-protocol/contracts,@unlock-protocol/networks,@unlock-protocol/paywall,@unlock-protocol/unlock-js,@unlock-protocol/crypto-icon,@unlock-protocol/ui,@unlock-protocol/hardhat-plugin,@unlock-protocol/email-templates}'",
"provision": "hardhat run scripts/provision.ts",
"start": "hardhat node"
},
"workspaces": [
"packages/**"
],
"dependencies": {
"@nomicfoundation/hardhat-ethers": "3.0.5",
"@unlock-protocol/contracts": "workspace:^",
"@unlock-protocol/hardhat-plugin": "workspace:^",
"@unlock-protocol/networks": "workspace:^",
"@nomicfoundation/hardhat-ethers": "3.0.6",
"@unlock-protocol/contracts": "latest",
"@unlock-protocol/hardhat-plugin": "latest",
"@unlock-protocol/networks": "latest",
"eslint": "8.57.0",
"ethers": "6.12.1",
"ethers": "6.13.0",
"fs-extra": "11.2.0",
"hardhat": "2.22.3",
"hardhat": "2.22.5",
"hardhat-erc1820": "0.1.0",
"ts-node": "10.9.2",
"typescript": "5.4.5"
Expand Down
Loading

0 comments on commit c025689

Please sign in to comment.