Skip to content

Commit 96f5e91

Browse files
committed
Merge branch 'release/canary-pre-devnet' into feature/dependency-factory-decorator
2 parents 69dea73 + 957fc7f commit 96f5e91

127 files changed

Lines changed: 4699 additions & 1424 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@
9292
// Handled by prettier
9393
"@typescript-eslint/indent": ["off"],
9494
"@typescript-eslint/no-floating-promises": "error",
95-
"no-else-return": "off"
95+
"no-else-return": "off",
96+
"no-bitwise": "off"
9697
},
9798

9899
"overrides": [

.github/workflows/pull-request-develop.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
image: redis:6.2-alpine
114114
ports:
115115
- 6379:6379
116-
lighnet:
116+
lightnet:
117117
image: o1labs/mina-local-network:compatible-latest-lightnet
118118
env:
119119
RUN_ARCHIVE_NODE: true
@@ -126,6 +126,15 @@ jobs:
126126
- 8181:8181
127127
# archive endpoints
128128
- 8282:8282
129+
minio:
130+
# fixme: let's not depend on external unofficial image
131+
image: lazybit/minio
132+
ports:
133+
- 9000:9000
134+
env:
135+
MINIO_ROOT_USER: minioadmin
136+
MINIO_ROOT_PASSWORD: minioadmin
137+
options: --name=minio --health-cmd "curl http://localhost:9000/minio/health/live"
129138

130139
steps:
131140
- uses: actions/checkout@v3
@@ -151,4 +160,4 @@ jobs:
151160
polling-interval-ms: 5000
152161

153162
- name: "Integration tests"
154-
run: npm run test:integration
163+
run: npm run test:integration

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ docs
88

99
# dependencies
1010
node_modules
11+
.nx
1112

1213
# IDEs and editors
1314
/.idea
@@ -42,4 +43,4 @@ lerna-debug.log
4243

4344
docs/save
4445
packages/research
45-
packages/indexer/src/api/generated
46+
packages/indexer/src/api/generated

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
1616
- Separated settlement and bridging functionally, so now settlement can be used without bridging [#376](https://github.com/proto-kit/framework/pull/376)
1717
- Added nightly releases via pkg.pr.new [#384](https://github.com/proto-kit/framework/pull/384)
1818
- Introduced Changelog [#378](https://github.com/proto-kit/framework/pull/378)
19+
20+
### Removed
21+
22+
- Removed `tick` event on `BlockTrigger` [#417](https://github.com/proto-kit/framework/pull/417)
23+

0 commit comments

Comments
 (0)