Skip to content
Closed
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
1 change: 1 addition & 0 deletions .github/workflows/reusable/cached-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ runs:
packages/sdk/src/generated
packages/autocertifier-client/generated
packages/proto-rpc/generated
packages/proto-rpc/test/proto
packages/dht/generated
packages/trackerless-network/generated
- name: ci
Expand Down
3 changes: 1 addition & 2 deletions packages/autocertifier-client/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"extends": "../../tsconfig.node.json",
"compilerOptions": {
"outDir": "dist",
"noImplicitOverride": false
"outDir": "dist"
},
"include": [
"src",
Expand Down
2 changes: 1 addition & 1 deletion packages/dht/test/unit/PeerManager.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const createDhtNodeRpcRemote = (
) => {
const remote = new class extends DhtNodeRpcRemote {
// eslint-disable-next-line class-methods-use-this
async ping(): Promise<boolean> {
override async ping(): Promise<boolean> {
return !pingFailures.has(toNodeId(peerDescriptor))
}
}(localPeerDescriptor, peerDescriptor, undefined as any, new MockRpcCommunicator())
Expand Down
4 changes: 2 additions & 2 deletions packages/dht/test/utils/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export const createMockRingNode = async (
rpcRequestTimeout: 5000
}
const node = new class extends DhtNode {
async stop(): Promise<void> {
override async stop(): Promise<void> {
await super.stop()
await mockConnectionManager.stop()
}
Expand Down Expand Up @@ -90,7 +90,7 @@ export const createMockConnectionDhtNode = async (
rpcRequestTimeout: 5000
}
const node = new class extends DhtNode {
async stop(): Promise<void> {
override async stop(): Promise<void> {
await super.stop()
await mockConnectionManager.stop()
}
Expand Down
5 changes: 1 addition & 4 deletions packages/dht/tsconfig.jest.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
{
"extends": "../../tsconfig.jest.json",
"compilerOptions": {
"noImplicitOverride": false
},
"include": [
"src",
"generated",
"test",
"package.json",
"scripts"
],
"references": [
{ "path": "./tsconfig.proto.json" },
{ "path": "../utils/tsconfig.node.json" },
{ "path": "../test-utils/tsconfig.node.json" },
{ "path": "../proto-rpc/tsconfig.node.json" },
Expand Down
5 changes: 1 addition & 4 deletions packages/dht/tsconfig.karma.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
"extends": "../../tsconfig.karma.json",
"compilerOptions": {
"outDir": "dist",
"types": [
"jest",
"jest-extended"
]
"types": ["jest", "jest-extended"]
},
"include": [
"src",
Expand Down
5 changes: 2 additions & 3 deletions packages/dht/tsconfig.node.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
{
"extends": "../../tsconfig.node.json",
"compilerOptions": {
"outDir": "dist",
"noImplicitOverride": false
"outDir": "dist"
},
"include": [
"src",
"generated",
"package.json"
],
"references": [
{ "path": "./tsconfig.proto.json" },
{ "path": "../utils/tsconfig.node.json" },
{ "path": "../test-utils/tsconfig.node.json" },
{ "path": "../proto-rpc/tsconfig.node.json" },
Expand Down
9 changes: 9 additions & 0 deletions packages/dht/tsconfig.proto.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extends": "../../tsconfig.proto.json",
"compilerOptions": {
"outDir": "dist"
},
"include": [
"generated"
]
}
4 changes: 2 additions & 2 deletions packages/proto-rpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"license": "(Apache-2.0 AND BSD-3-Clause)",
"author": "Streamr Network AG <[email protected]>",
"scripts": {
"prebuild": "./proto.sh",
"build": "tsc -b tsconfig.node.json",
"prebuild": "./proto.sh && ./test-proto.sh",
"build": "tsc -b tsconfig.node.json && tsc -b tsconfig.test-proto.json",
"build-browser": "webpack --mode=development --progress",
"check": "./test-proto.sh && tsc -p ./tsconfig.jest.json",
"clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
Expand Down
11 changes: 9 additions & 2 deletions packages/proto-rpc/test-proto.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
mkdir -p ./test/proto
npx protoc --ts_out ./test/proto --ts_opt server_generic,generate_dependencies --proto_path test/protos test/protos/*.proto --experimental_allow_proto3_optional
# Run protoc only when test/protos exists (it's absent in Docker builds)
if [ -d ./test/protos ]; then
mkdir -p ./test/proto
npx protoc \
--ts_out ./test/proto \
--ts_opt server_generic,generate_dependencies \
--proto_path test/protos test/protos/*.proto \
--experimental_allow_proto3_optional
fi
9 changes: 5 additions & 4 deletions packages/proto-rpc/tsconfig.jest.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{
"extends": "../../tsconfig.jest.json",
"compilerOptions": {
"noImplicitOverride": false
},
"include": [
"src",
"generated",
"test"
],
"exclude": [
"test/proto"
],
"references": [
{ "path": "./tsconfig.proto.json" },
{ "path": "./tsconfig.test-proto.json" },
{ "path": "../utils/tsconfig.node.json" },
{ "path": "../test-utils/tsconfig.node.json" }
]
Expand Down
4 changes: 1 addition & 3 deletions packages/proto-rpc/tsconfig.karma.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
"extends": "../../tsconfig.karma.json",
"compilerOptions": {
"outDir": "dist",
"types": [
"jest"
]
"types": ["jest"]
},
"include": [
"src"
Expand Down
7 changes: 3 additions & 4 deletions packages/proto-rpc/tsconfig.node.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{
"extends": "../../tsconfig.node.json",
"compilerOptions": {
"outDir": "dist",
"noImplicitOverride": false
"outDir": "dist"
},
"include": [
"src",
"generated"
"src"
],
"references": [
{ "path": "./tsconfig.proto.json" },
{ "path": "../utils/tsconfig.node.json" }
]
}
9 changes: 9 additions & 0 deletions packages/proto-rpc/tsconfig.proto.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extends": "../../tsconfig.proto.json",
"compilerOptions": {
"outDir": "dist"
},
"include": [
"generated"
]
}
9 changes: 9 additions & 0 deletions packages/proto-rpc/tsconfig.test-proto.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extends": "../../tsconfig.proto.json",
"compilerOptions": {
"emitDeclarationOnly": true
},
"include": [
"test/proto"
]
}
2 changes: 1 addition & 1 deletion packages/sdk/src/identity/EthereumKeyPairIdentity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export class EthereumKeyPairIdentity extends KeyPairIdentity {
return signingUtil.createSignature(payload, this.privateKey)
}

async getTransactionSigner(rpcProviderSource: RpcProviderSource): Promise<SignerWithProvider> {
override async getTransactionSigner(rpcProviderSource: RpcProviderSource): Promise<SignerWithProvider> {
const primaryProvider = rpcProviderSource.getProvider()
return new Wallet(binaryToHex(this.privateKey), primaryProvider) as SignerWithProvider
}
Expand Down
6 changes: 4 additions & 2 deletions packages/sdk/tsconfig.jest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"compilerOptions": {
"lib": ["es2021", "dom"],
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"noImplicitOverride": false
"emitDecoratorMetadata": true
},
"include": [
"package.json",
Expand All @@ -16,10 +15,13 @@
"scripts"
],
"exclude": [
"src/generated/google",
"src/generated/packages",
"test/exports",
"src/exports-esm.mjs"
],
"references": [
{ "path": "./tsconfig.proto.json" },
{ "path": "../test-utils/tsconfig.node.json" },
{ "path": "../dht/tsconfig.node.json" },
{ "path": "../trackerless-network/tsconfig.node.json" }
Expand Down
6 changes: 4 additions & 2 deletions packages/sdk/tsconfig.node.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@
"declarationDir": "dist/types",
"lib": ["es2021", "dom"],
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"noImplicitOverride": false
"emitDecoratorMetadata": true
},
"include": [
"src",
"src/**/*.json"
],
"exclude": [
"src/generated/google",
"src/generated/packages",
"src/exports-esm.mjs"
],
"references": [
{ "path": "./tsconfig.proto.json" },
{ "path": "../test-utils/tsconfig.node.json" },
{ "path": "../trackerless-network/tsconfig.node.json" },
{ "path": "../dht/tsconfig.node.json" }
Expand Down
11 changes: 11 additions & 0 deletions packages/sdk/tsconfig.proto.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"extends": "../../tsconfig.proto.json",
"compilerOptions": {
"outDir": "dist",
"declarationDir": "dist/types"
},
"include": [
"src/generated/google",
"src/generated/packages"
]
}
5 changes: 2 additions & 3 deletions packages/trackerless-network/tsconfig.jest.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@
"node",
"jest",
"@streamr/test-utils/customMatcherTypes"
],
"noImplicitOverride": false
]
},
"include": [
"src",
"generated",
"test",
"package.json"
],
"references": [
{ "path": "./tsconfig.proto.json" },
{ "path": "../proto-rpc/tsconfig.node.json" },
{ "path": "../dht/tsconfig.node.json" }
]
Expand Down
3 changes: 1 addition & 2 deletions packages/trackerless-network/tsconfig.karma.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
]
},
"include": [
"src",
"generated"
"src"
]
}
5 changes: 2 additions & 3 deletions packages/trackerless-network/tsconfig.node.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
{
"extends": "../../tsconfig.node.json",
"compilerOptions": {
"outDir": "dist",
"noImplicitOverride": false
"outDir": "dist"
},
"include": [
"src",
"generated",
"test/benchmark/first-message.ts",
"test/utils/utils.ts",
"package.json"
],
"references": [
{ "path": "./tsconfig.proto.json" },
{ "path": "../dht/tsconfig.node.json" }
]
}
9 changes: 9 additions & 0 deletions packages/trackerless-network/tsconfig.proto.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extends": "../../tsconfig.proto.json",
"compilerOptions": {
"outDir": "dist"
},
"include": [
"generated"
]
}
6 changes: 6 additions & 0 deletions tsconfig.proto.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": "./tsconfig.node.json",
"compilerOptions": {
"noImplicitOverride": false
}
}
Loading