Skip to content

Commit

Permalink
Update minor and patch updates (#7153)
Browse files Browse the repository at this point in the history
* allowing referrer to be passed in demo

* Update minor and patch updates

* fixed linting

Co-authored-by: Julien Genestoux <julien.genestoux@gmail.com>
Co-authored-by: Renovate Bot <bot@renovateapp.com>
  • Loading branch information
3 people committed Jun 18, 2021
1 parent 6438587 commit e087a16
Show file tree
Hide file tree
Showing 44 changed files with 1,623 additions and 1,195 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rebase.yml
Expand Up @@ -12,7 +12,7 @@ jobs:
with:
fetch-depth: 0
- name: Automatic Rebase
uses: cirrus-actions/rebase@1.4
uses: cirrus-actions/rebase@1.5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# https://github.community/t5/GitHub-Actions/Workflow-is-failing-if-no-job-can-be-ran-due-to-condition/m-p/38186#M3250
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.override.yml
Expand Up @@ -21,7 +21,7 @@ services:

jaeger:
restart: always
image: jaegertracing/all-in-one:1.22
image: jaegertracing/all-in-one:1.23
ports:
- '5775:5775/udp'
- '6831:6831/udp'
Expand Down
3 changes: 1 addition & 2 deletions locksmith/src/app.ts
Expand Up @@ -12,8 +12,7 @@ import { resolvers } from './graphql/resolvers'
const app = express()

Sentry.init({
dsn:
'https://30c5b6884872435f8cbda4978c349af9@o555569.ingest.sentry.io/5685514',
dsn: 'https://30c5b6884872435f8cbda4978c349af9@o555569.ingest.sentry.io/5685514',
integrations: [
// enable HTTP calls tracing
new Sentry.Integrations.Http({ tracing: true }),
Expand Down
11 changes: 6 additions & 5 deletions locksmith/src/controllers/metadataController.ts
Expand Up @@ -206,11 +206,12 @@ namespace MetadataController {
const lockAddress = Normalizer.ethereumAddress(
payload.message.LockMetaData.address
)
const keyHolderAddresses = await new KeyHoldersByLock().getKeyHoldingAddresses(
lockAddress,
payload.message.LockMetaData.page || 0,
req.chain
)
const keyHolderAddresses =
await new KeyHoldersByLock().getKeyHoldingAddresses(
lockAddress,
payload.message.LockMetaData.page || 0,
req.chain
)
const isAuthorized = await evaluateLockOwnership(
lockAddress,
req.signee,
Expand Down
6 changes: 2 additions & 4 deletions locksmith/src/controllers/priceController.ts
Expand Up @@ -22,10 +22,8 @@ namespace PriceController {
)

// let's see if the lock was authorized for credit card payments
const isAuthorizedForCreditCard = await AuthorizedLockOperations.hasAuthorization(
lockAddress,
req.chain
)
const isAuthorizedForCreditCard =
await AuthorizedLockOperations.hasAuthorization(lockAddress, req.chain)

// TODO: check that the purchaser has enough funds to pay for gas?

Expand Down
9 changes: 2 additions & 7 deletions locksmith/src/controllers/purchaseController.ts
Expand Up @@ -15,13 +15,8 @@ namespace PurchaseController {
req: SignedRequest,
res: Response
): Promise<any> => {
const {
publicKey,
lock,
stripeTokenId,
pricing,
network,
} = req.body.message['Charge Card']
const { publicKey, lock, stripeTokenId, pricing, network } =
req.body.message['Charge Card']

// First, get the locks stripe account
const stripeConnectApiKey = await getStripeConnectForLock(
Expand Down
6 changes: 2 additions & 4 deletions locksmith/src/controllers/transactionController.js
@@ -1,9 +1,7 @@
const transactionOperations = require('../operations/transactionOperations')

const {
findOrCreateTransaction,
getTransactionsByFilter,
} = transactionOperations
const { findOrCreateTransaction, getTransactionsByFilter } =
transactionOperations

const transactionCreate = async (req, res) => {
const transaction = req.body
Expand Down
11 changes: 6 additions & 5 deletions locksmith/src/controllers/userController.ts
Expand Up @@ -187,11 +187,12 @@ namespace UserController {
return res.sendStatus(401)
}

const stripeCustomerId = await StripeOperations.getStripeCustomerIdForAddress(
ethereumAddress,
// @ts-expect-error
data?.message?.stripeApiKey || ''
)
const stripeCustomerId =
await StripeOperations.getStripeCustomerIdForAddress(
ethereumAddress,
// @ts-expect-error
data?.message?.stripeApiKey || ''
)
if (!stripeCustomerId) {
return res.json([])
}
Expand Down
1 change: 1 addition & 0 deletions locksmith/src/models/keyMetadata.ts
@@ -1,4 +1,5 @@
import { Table, Model, Column, DataType } from 'sequelize-typescript'

@Table({ tableName: 'KeyMetadata', timestamps: true })
// eslint-disable-next-line import/prefer-default-export
export class KeyMetadata extends Model<KeyMetadata> {
Expand Down
1 change: 1 addition & 0 deletions locksmith/src/models/lock.ts
@@ -1,4 +1,5 @@
import { Table, Model, Column } from 'sequelize-typescript'

@Table({ tableName: 'Locks', timestamps: true })
// eslint-disable-next-line import/prefer-default-export
export class Lock extends Model<Lock> {
Expand Down
1 change: 1 addition & 0 deletions locksmith/src/models/lockMetadata.ts
@@ -1,4 +1,5 @@
import { Table, Model, Column, DataType } from 'sequelize-typescript'

@Table({ tableName: 'LockMetadata', timestamps: true })
// eslint-disable-next-line import/prefer-default-export
export class LockMetadata extends Model<LockMetadata> {
Expand Down
1 change: 1 addition & 0 deletions locksmith/src/models/parsedBlockForLockCreation.ts
@@ -1,4 +1,5 @@
import { Model, Table, Column } from 'sequelize-typescript'

@Table({ tableName: 'ParsedBlockForLockCreations', timestamps: true })
// eslint-disable-next-line import/prefer-default-export
export class ParsedBlockForLockCreation extends Model<ParsedBlockForLockCreation> {
Expand Down
10 changes: 5 additions & 5 deletions newsletter/package.json
Expand Up @@ -13,26 +13,26 @@
"ci": "yarn test && yarn lint"
},
"dependencies": {
"@testing-library/jest-dom": "5.12.0",
"@testing-library/jest-dom": "5.14.1",
"@testing-library/react": "11.2.7",
"@testing-library/react-hooks": "5.1.3",
"@types/node": "13.13.48",
"axios": "0.21.1",
"babel-jest": "27.0.2",
"dotenv": "10.0.0",
"eslint": "7.25.0",
"eslint": "7.28.0",
"jest": "26.6.3",
"jest-date-mock": "1.0.8",
"netlify-cli": "3.28.0",
"netlify-cli": "3.37.37",
"next": "10.2.3",
"prettier": "2.2.1",
"prettier": "2.3.1",
"prop-types": "15.7.2",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-test-renderer": "17.0.2",
"styled-components": "5.3.0",
"ts-jest": "26.5.6",
"typescript": "4.2.4"
"typescript": "4.3.4"
},
"lint-staged": {
"*.{js,ts,tsx}": [
Expand Down

0 comments on commit e087a16

Please sign in to comment.