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

ci: fix gh actions #8

Merged
merged 5 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 7 additions & 9 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"extends": ["hardcore", "hardcore/ts", "hardcore/jest"],
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
"plugin:o1js/recommended",
],
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint"],
"root": true,
Expand All @@ -21,14 +26,7 @@
"allow": ["public"]
}
],
"jest/no-hooks": [
"error",
{
"allow": ["beforeEach", "afterEach", "beforeAll", "afterAll"]
}
],
"@typescript-eslint/consistent-indexed-object-style": "off",
"import/no-extraneous-dependencies": ["error", {"peerDependencies": true}]
"@typescript-eslint/consistent-indexed-object-style": "off"

}
}
12 changes: 6 additions & 6 deletions .github/workflows/pull-request-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

# install dependencies from the package-lock.json
- name: Install dependencies
run: npm ci --workspaces
run: npm ci

# builds all packages
build:
Expand All @@ -43,7 +43,7 @@ jobs:
cache: npm

- name: 'Install dependencies'
run: npm ci --workspaces --include-workspace-root
run: npm ci

- name: 'Build'
run: npm run build
Expand All @@ -61,7 +61,7 @@ jobs:
cache: npm

- name: 'Install dependencies'
run: npm ci --workspaces --include-workspace-root
run: npm ci

- name: 'Build'
run: npm run build
Expand All @@ -81,13 +81,13 @@ jobs:
cache: npm

- name: 'Install dependencies'
run: npm ci --workspaces --include-workspace-root
run: npm ci

- name: 'Build'
run: npm run build

- name: 'Reinstall monorepo packages'
run: npm ci --workspaces --include-workspace-root
run: npm ci

- name: 'Test'
run: npm run test:ci
run: npm run test
3,808 changes: 1,940 additions & 1,868 deletions package-lock.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
"@babel/preset-env": "^7.16.4",
"@babel/preset-typescript": "^7.16.0",
"@types/jest": "^27.0.3",
"@typescript-eslint/eslint-plugin": "^5.5.0",
"@typescript-eslint/parser": "^5.5.0",
"@typescript-eslint/eslint-plugin": "^6.12.0",
"@typescript-eslint/parser": "^6.0.0",
"eslint": "^8.7.0",
"eslint-plugin-o1js": "^0.4.0",
"jest": "^27.3.1",
"jest": "^29.7.0",
"prettier": "^2.3.2",
"ts-jest": "^27.0.7",
"typescript": "^4.7.2"
"ts-jest": "^29.1.2",
"typescript": "^5.2.2"
},
"peerDependencies": {
"o1js": "0.17.0"
Expand Down
3 changes: 0 additions & 3 deletions src/TokenAccount.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
/* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
import {
AccountUpdate,
Permissions,
PublicKey,
SmartContract,
UInt64,
method,
PrivateKey,
Circuit,
state,
State,
DeployArgs,
Expand Down
4 changes: 2 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import "reflect-metadata";
import "core-js";
import 'reflect-metadata';
import 'core-js';
export * from './interfaces';
export * from './token';
export * from './errors';
Expand Down
4 changes: 2 additions & 2 deletions src/interfaces/admin/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import "reflect-metadata";
import "core-js";
import 'reflect-metadata';
import 'core-js';
export * from './admin'
4 changes: 2 additions & 2 deletions src/interfaces/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import "reflect-metadata";
import "core-js";
import 'reflect-metadata';
import 'core-js';
export * from './admin';
export * from './tokenAccount';
export * from './token';
1 change: 0 additions & 1 deletion src/interfaces/token/adminable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
type State,
Struct,
Field,
Bool,
VerificationKey,
} from 'o1js';

Expand Down
4 changes: 2 additions & 2 deletions src/interfaces/token/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import "reflect-metadata";
import "core-js";
import 'reflect-metadata';
import 'core-js';
export * from './adminable';
export * from './approvable';
export * from './transferable';
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/token/transferable.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable new-cap */
/* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
import { PublicKey, UInt64, AccountUpdate, Struct } from 'o1js';
import { PublicKey, UInt64, AccountUpdate } from 'o1js';

interface Transferable {
transfer(from: PublicKey | AccountUpdate,
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/token/viewable.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
import { PublicKey, Account, UInt64, Bool } from 'o1js';
import { PublicKey, Account, UInt64 } from 'o1js';

interface Viewable {
// eslint-disable-next-line no-warning-comments
Expand Down
4 changes: 2 additions & 2 deletions src/interfaces/tokenAccount/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import "reflect-metadata";
import "core-js";
import 'reflect-metadata';
import 'core-js';
export * from './depositable';
export * from './withdrawable';
1 change: 0 additions & 1 deletion src/token.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ class Token

// eslint-disable-next-line no-warning-comments
// TODO: find out why amount can't be Int64, also for burn
// eslint-disable-next-line putout/putout
return this.internal.mint({ address, amount });
}

Expand Down
Loading