Skip to content
This repository has been archived by the owner on Dec 27, 2022. It is now read-only.

Remove LockService #560

Merged
merged 203 commits into from
Jun 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
203 commits
Select commit Hold shift + click to select a range
3109829
Add npm package
LayneHaber Apr 13, 2021
0741ded
Remove all lock service
LayneHaber Apr 13, 2021
8fcd7ab
Added getNextNonceForUpdate
That3Percent Apr 13, 2021
8b8479d
Merge pull request #562 from connext/zac/lock-free
LayneHaber Apr 13, 2021
431682b
Merge pull request #561 from connext/556-1-remove-lock
LayneHaber Apr 13, 2021
62fcc52
Added test cases for getNextNonceForUpdate
That3Percent Apr 13, 2021
dfb5e7b
Merge pull request #563 from connext/zac/lock-free
LayneHaber Apr 13, 2021
7041541
Merge branch 'main' into 556-no-lock
LayneHaber Apr 14, 2021
668fa18
Add new error
LayneHaber Apr 14, 2021
148942c
Add transfer creation utilities
LayneHaber Apr 14, 2021
bf07255
Return tree from verify
LayneHaber Apr 14, 2021
8f31042
WIP queue changes
LayneHaber Apr 14, 2021
8c912c7
Remove unused utility
LayneHaber Apr 15, 2021
32ce9bc
Started queue for serializing updates
That3Percent Apr 19, 2021
4a71614
Merge branch 'main' into 556-no-lock
LayneHaber Apr 19, 2021
9b8ded5
Merge branch '556-no-lock' into zac/queue
LayneHaber Apr 19, 2021
3adb29b
Queue update loop
That3Percent Apr 19, 2021
b542e1e
SerializableQueue correctly resolves/rejects/ignores updates
That3Percent Apr 19, 2021
36aebb6
Fix build
LayneHaber Apr 19, 2021
265b1a0
Merge branch 'zac/queue' of https://github.com/connext/vector into za…
LayneHaber Apr 19, 2021
5093bbe
SerializedQueue: Added tests
That3Percent Apr 19, 2021
66c9eec
whitespace
LayneHaber Apr 20, 2021
9bb3b8b
SerializedQueue: Do not validate transitions in queue
That3Percent Apr 20, 2021
069edb2
SerializedQueue: More tests
That3Percent Apr 20, 2021
97c209f
Use QueuedUpdateErrors
LayneHaber Apr 21, 2021
d274fd8
Default type to any
LayneHaber Apr 21, 2021
a1efcf6
Add persist utilities
LayneHaber Apr 21, 2021
ebc41b2
Add logic for self updates
LayneHaber Apr 21, 2021
2e216a5
Remove store calls from sync methods, remove message sending from inb…
LayneHaber Apr 21, 2021
b8232b4
Add other update handling
LayneHaber Apr 21, 2021
e820ec5
Minor types changes
LayneHaber Apr 21, 2021
f464c67
Merge pull request #570 from connext/zac/queue
LayneHaber Apr 21, 2021
d839bb9
Merge branch 'main' into 556-no-lock
LayneHaber Apr 21, 2021
842d3e1
Merge branch '556-no-lock' into 556-self-other-update
LayneHaber Apr 21, 2021
30a8a18
whitespace
LayneHaber Apr 21, 2021
dcd287b
OtherUpdate types changes
LayneHaber Apr 21, 2021
75780e8
Queue typing
LayneHaber Apr 22, 2021
b2779e6
Fix tests for updated typings
LayneHaber Apr 22, 2021
7f2edd3
comment out/skip unit tests temporarily
LayneHaber Apr 22, 2021
a340c8a
Integration tests passing
LayneHaber Apr 22, 2021
923729b
Remove server node unit tests
LayneHaber Apr 22, 2021
d9f1b41
Merge pull request #578 from connext/556-self-other-update
LayneHaber Apr 22, 2021
ee4b5d8
Merge branch 'main' into 556-no-lock
LayneHaber Apr 22, 2021
9f370dd
WIP: add protocol retry helper
LayneHaber Apr 22, 2021
f06072d
Merge branch '575-routing-complete-event' into 556-no-lock
LayneHaber Apr 22, 2021
d8a7829
Add retry logic
LayneHaber Apr 22, 2021
5eb657e
Cleanup restore messaging flow
LayneHaber Apr 22, 2021
dd6833a
Merge pull request #579 from connext/556-restore-no-lock
LayneHaber Apr 22, 2021
eb5257d
Merge branch 'main' into 556-no-lock
LayneHaber Apr 22, 2021
0401757
Merge branch '556-no-lock' of https://github.com/connext/vector into …
LayneHaber Apr 22, 2021
ee05d4d
Switch merkle tree libs
LayneHaber Apr 23, 2021
b450593
Switch merkle tree libs
LayneHaber Apr 23, 2021
4103016
Use old tree for proof (temp)
LayneHaber Apr 23, 2021
0bb4911
Remove merkleProofData from updates
LayneHaber Apr 23, 2021
83cc80c
Remove merkle proof data from update details
LayneHaber Apr 23, 2021
767e612
WIP building test
LayneHaber Apr 23, 2021
3ab5895
Tests passing with lib
rhlsthrm Apr 26, 2021
b2c4787
Switched libs
rhlsthrm Apr 26, 2021
67618bc
Properly free
LayneHaber Apr 26, 2021
8dba353
Use connext pkg
LayneHaber Apr 26, 2021
cdee97f
Clean tests
LayneHaber Apr 26, 2021
444af76
Merge branch 'main' into switch-merkle-libs
LayneHaber Apr 26, 2021
a8f74ba
Merge branch 'main' into 556-no-lock
LayneHaber Apr 26, 2021
10b86cb
Merge branch 'switch-merkle-libs' into 556-no-lock
LayneHaber Apr 26, 2021
aa0d979
Fix utility function
LayneHaber Apr 26, 2021
0895316
Add function to update tree
LayneHaber Apr 26, 2021
a235834
Implement tree in memory
LayneHaber Apr 26, 2021
f71afde
Comment out unit tests
LayneHaber Apr 26, 2021
184eaad
Fix removeTransferFromTree function
LayneHaber Apr 26, 2021
029993b
Bump packages
LayneHaber Apr 26, 2021
6bfc11f
Npm i
LayneHaber Apr 26, 2021
6ca61ec
Cleaner `free` usage
LayneHaber Apr 26, 2021
89d95e8
Dont use result type
LayneHaber Apr 26, 2021
99c323a
Fix build
LayneHaber Apr 26, 2021
43a47a5
Update package
LayneHaber Apr 26, 2021
9ecda12
Undo merkle updates in synced channel case
LayneHaber Apr 26, 2021
a08d60c
Fix build
LayneHaber Apr 26, 2021
68af150
Undo merkle root changes if update fails
LayneHaber Apr 26, 2021
11578bd
Latest package
LayneHaber Apr 26, 2021
bc9c579
Fix iframe-app-js build by overriding CRA config, adding wasm-loader
Jannis Apr 26, 2021
228c6ed
Fix null pointer passed to Rust in merkle tree tests
Jannis Apr 26, 2021
2167c06
Merge pull request #586 from connext/jannis/fix-iframe-app-js-build
LayneHaber Apr 26, 2021
90163cc
Merge branch 'switch-merkle-libs' into 556-switch-lib
LayneHaber Apr 26, 2021
d29a00c
Fix a few webpack configs to copy the merkle tree WASM module
Jannis Apr 27, 2021
687d2f5
Merge pull request #587 from connext/jannis/fix-webpack-configs
LayneHaber Apr 27, 2021
24fde19
Fix merkle tree WASM module to be included in router image
Jannis Apr 27, 2021
65360f6
Add (maybe) missing wasm-loader to router webpack config
Jannis Apr 27, 2021
43af0ac
Merge pull request #590 from connext/jannis/fix-wasm-in-router
Apr 27, 2021
4bb3442
By default always immediately free tree
LayneHaber Apr 27, 2021
72f14fd
Build
LayneHaber Apr 27, 2021
85e9b96
look at previous nonce ony
LayneHaber Apr 27, 2021
1677e27
Isolate undoing merkle for outbound into function, add store retrieva…
LayneHaber Apr 27, 2021
bcc4b5f
Annoying EffingScript
LayneHaber Apr 27, 2021
568223e
wen rust
LayneHaber Apr 27, 2021
58cf378
Fix utils tests
LayneHaber Apr 27, 2021
3125380
Remove unused imports
LayneHaber Apr 27, 2021
35da89d
Dont mutate active
LayneHaber Apr 27, 2021
e29a5e8
Revert test changes
LayneHaber Apr 27, 2021
ca96b7e
Fix build
LayneHaber Apr 27, 2021
8ac080f
Use same version
LayneHaber Apr 27, 2021
8cda69e
Add more logging
LayneHaber Apr 28, 2021
2412d69
More logging
LayneHaber Apr 29, 2021
bed226b
install
LayneHaber Apr 29, 2021
fd9e23a
Remove in memory merkle trees
LayneHaber Apr 29, 2021
99c6408
Test on GH
LayneHaber Apr 29, 2021
2df84cd
Merge branch 'main' into 556-no-lock
LayneHaber Apr 29, 2021
106c3f6
Merge branch '556-no-lock' into 556-switch-lib
LayneHaber Apr 29, 2021
4a53589
Test on GH
LayneHaber Apr 29, 2021
bbec7dd
Worked
LayneHaber Apr 29, 2021
1b89f16
Logs
LayneHaber Apr 30, 2021
6a584f0
Add encodedCoreState property
LayneHaber Apr 30, 2021
76fd2c2
Use encoded core state
LayneHaber Apr 30, 2021
044ca81
Speedy encoding
LayneHaber Apr 30, 2021
53e1dfd
Add profiling test (skipped)
LayneHaber Apr 30, 2021
7b78fe2
Fix adjudicator
LayneHaber Apr 30, 2021
53df55e
Remove .only
LayneHaber Apr 30, 2021
85ade9b
Bump protocol timeout
LayneHaber Apr 30, 2021
7de0707
Revert "Add encodedCoreState property"
LayneHaber Apr 30, 2021
fdfa0ff
Revert "Use encoded core state"
LayneHaber Apr 30, 2021
684527a
Fix build
LayneHaber Apr 30, 2021
113ce62
Added timeout test for queue
That3Percent Apr 30, 2021
9e8c592
Fix race when setting up channel
That3Percent May 3, 2021
6d74e0b
Merge pull request #600 from connext/zac/test-timeout
LayneHaber May 3, 2021
fe029fe
Merge pull request #602 from connext/setup-race
LayneHaber May 3, 2021
7ca293f
bump timeout
LayneHaber May 3, 2021
7bd4207
Remove unused imports
LayneHaber May 3, 2021
5ae0701
Merge branch '556-switch-lib' of https://github.com/connext/vector in…
LayneHaber May 3, 2021
a6a75d5
Improve logs
LayneHaber May 3, 2021
b17eeff
Fix events
LayneHaber May 3, 2021
8257ee5
Reduce time
LayneHaber May 3, 2021
438053e
Merge branch 'main' into 556-no-lock
LayneHaber May 4, 2021
52af836
Merge branch '556-no-lock' into 556-switch-lib
LayneHaber May 4, 2021
7391ab9
Right version
LayneHaber May 4, 2021
e5f4ec7
Browser node and test-ui compiling with wasm
LayneHaber May 5, 2021
9c13674
Merge branch 'main' into 556-no-lock
LayneHaber May 5, 2021
fc4b66b
Merge branch '556-no-lock' into 556-switch-lib
LayneHaber May 5, 2021
406fd36
Merge branch 'main' into 556-no-lock
LayneHaber May 5, 2021
8e1d715
Merge branch '556-no-lock' into 556-switch-lib
LayneHaber May 5, 2021
bc65cb5
Merge branch 'main' into 556-no-lock
LayneHaber May 5, 2021
588ff33
Merge branch '556-no-lock' into 556-switch-lib
LayneHaber May 5, 2021
99f7453
iframe working with wasm
LayneHaber May 6, 2021
a34af4f
wrong package
LayneHaber May 6, 2021
405be9f
Clean up
LayneHaber May 10, 2021
c6339a0
Merge branch 'main' into 556-no-lock
LayneHaber May 10, 2021
0ad3b7a
Merge branch '556-no-lock' into 556-switch-lib
LayneHaber May 10, 2021
3aba0a6
Use latest ethers
LayneHaber May 10, 2021
788ace4
Bugfix: Promise.race leaks when given long-running promises
That3Percent May 10, 2021
dd991e2
Merge pull request #614 from connext/zac/promise-leak
LayneHaber May 11, 2021
c2cfdd8
Merge branch '556-switch-lib' of https://github.com/connext/vector in…
LayneHaber May 11, 2021
71a769c
Merge branch 'main' into 556-no-lock
LayneHaber May 11, 2021
e73c43a
Merge branch '556-no-lock' into 556-switch-lib
LayneHaber May 11, 2021
0e1073e
Add multitransfer tests
LayneHaber May 11, 2021
9fe9ac6
Merge pull request #585 from connext/556-switch-lib
LayneHaber May 12, 2021
3ea511b
make
LayneHaber May 12, 2021
a762b7b
Fix logs and comments
LayneHaber May 12, 2021
fe7bf69
Fix inbound tests
LayneHaber May 12, 2021
c033122
Fix remaining inbound tests
LayneHaber May 12, 2021
2bfc598
Fix sync tests
LayneHaber May 13, 2021
ecf84b1
Merge pull request #619 from connext/sync-unit-tests
LayneHaber May 13, 2021
5572997
Merge branch 'main' into 556-no-lock
LayneHaber May 13, 2021
22d9603
Fix update tests
LayneHaber May 14, 2021
381c7ce
Merge pull request #620 from connext/fix-update-tests
LayneHaber May 14, 2021
51024f6
Fix validation
LayneHaber May 14, 2021
ba64333
remove only
LayneHaber May 14, 2021
89c0733
Merge pull request #621 from connext/fix-validation-tst
LayneHaber May 14, 2021
810b651
Merge branch 'main' into 556-no-lock
LayneHaber May 20, 2021
ab796f5
Fix build
LayneHaber May 20, 2021
56ec591
Run in CI
LayneHaber May 20, 2021
051ff7a
Fix the entrypoint
LayneHaber May 20, 2021
cd368a9
Merge pull request #631 from connext/556-fix-prod-messaging
LayneHaber May 20, 2021
74908bc
Cleanup
rhlsthrm May 25, 2021
9452f06
npm publish @connext/{types,utils,contracts,protocol,engine,browser-n…
rhlsthrm May 25, 2021
9cfa043
Merge branch 'remote-load-tests' into 556-no-lock
LayneHaber May 27, 2021
7f571e9
Better error logging
LayneHaber May 27, 2021
abffb6f
Improve logging
LayneHaber May 28, 2021
f4971fe
Respond before saving to avoid unnecessary race
LayneHaber May 28, 2021
1d115ff
More logs
LayneHaber May 28, 2021
376ed6a
Channel address log on engine retries
LayneHaber May 28, 2021
63d61ea
Remove unused imports
LayneHaber May 28, 2021
aa7445f
Merge branch 'main' into 556-no-lock
LayneHaber May 29, 2021
c4c196f
Test
LayneHaber May 29, 2021
948c76d
Try not responding if cancelled on inbound
LayneHaber May 30, 2021
5c84b34
More funds
LayneHaber May 30, 2021
3d8e9fc
Improve log
LayneHaber Jun 1, 2021
f3414e2
Add update id type
LayneHaber Jun 2, 2021
a44af5d
Add checking of update id to protocol
LayneHaber Jun 2, 2021
f58e151
only exit on initiator if not cancelled
LayneHaber Jun 2, 2021
92730a3
Make restore appropriate
LayneHaber Jun 2, 2021
78fcd72
Fix tests
LayneHaber Jun 2, 2021
427b9c2
Move restore from engine to protocol
LayneHaber Jun 2, 2021
6294147
Add restoring check in protocol queue
LayneHaber Jun 2, 2021
b0d5e74
Add unit tests
LayneHaber Jun 3, 2021
d3416e5
Merge pull request #645 from connext/556-update-id
LayneHaber Jun 3, 2021
efabdf7
Merge pull request #647 from connext/556-restore-in-protocol
LayneHaber Jun 3, 2021
a9ee2c3
Merge branch 'main' into 556-no-lock
LayneHaber Jun 3, 2021
6062e70
Log at debug
LayneHaber Jun 3, 2021
b284d0b
Merge branch 'main' into 556-no-lock
LayneHaber Jun 7, 2021
9687602
Add protocol version check to types
LayneHaber Jun 7, 2021
a01a56f
Update on publish
LayneHaber Jun 7, 2021
4cc4d0e
Respond to lock message with error
LayneHaber Jun 7, 2021
8805b5b
Fix build
LayneHaber Jun 7, 2021
4cc8584
Merge branch 'main' into 556-no-lock
LayneHaber Jun 7, 2021
0da1b16
Merge pull request #650 from connext/556-protocol-version
LayneHaber Jun 7, 2021
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dev: messaging node router duet trio test-runner-js
prod: messaging-prod node-prod router-prod test-runner
all: dev prod iframe-app

messaging: auth-js ethprovider messaging-proxy nats
messaging: auth-bundle ethprovider messaging-proxy nats
messaging-prod: auth-img messaging-proxy nats

node: messaging server-node-img
Expand Down
18 changes: 18 additions & 0 deletions modules/auth/ops/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const CopyPlugin = require("copy-webpack-plugin");
const path = require("path");

module.exports = {
Expand Down Expand Up @@ -51,8 +52,25 @@ module.exports = {
},
},
},
{
test: /\.wasm$/,
type: "javascript/auto",
exclude: /node_modules/,
use: { loader: "wasm-loader" },
},
],
},

plugins: [
new CopyPlugin({
patterns: [
{
from: path.join(__dirname, "../../../node_modules/@connext/vector-merkle-tree/dist/node/index_bg.wasm"),
to: path.join(__dirname, "../dist/index_bg.wasm"),
},
],
}),
],

stats: { warnings: false },
};
4 changes: 2 additions & 2 deletions modules/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"test": "ts-mocha --check-leaks --exit --timeout 60000 'src/**/*.spec.ts'"
},
"dependencies": {
"@connext/vector-types": "0.2.5-beta.18",
"@connext/vector-utils": "0.2.5-beta.18",
"@connext/vector-types": "0.3.0-dev.0",
"@connext/vector-utils": "0.3.0-dev.0",
"@sinclair/typebox": "0.12.7",
"crypto": "1.0.1",
"fastify": "3.13.0",
Expand Down
74 changes: 74 additions & 0 deletions modules/browser-node/ops/webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
const CopyPlugin = require("copy-webpack-plugin");
const path = require("path");

module.exports = {
mode: "development",
target: "node",

context: path.join(__dirname, ".."),

entry: path.join(__dirname, "../src/index.ts"),

node: {
__filename: false,
__dirname: false,
},

resolve: {
mainFields: ["main", "module"],
extensions: [".js", ".wasm", ".ts", ".json"],
symlinks: false,
},

output: {
path: path.join(__dirname, "../dist"),
filename: "bundle.js",
},

module: {
rules: [
{
test: /\.js$/,
exclude: /node_modules/,
use: {
loader: "babel-loader",
options: {
presets: ["@babel/env"],
},
},
},
{
test: /\.ts$/,
exclude: /node_modules/,
use: {
loader: "ts-loader",
options: {
configFile: path.join(__dirname, "../tsconfig.json"),
},
},
},
{
test: /\.wasm$/,
type: "javascript/auto",
use: "wasm-loader",
},
],
},

plugins: [
new CopyPlugin({
patterns: [
{
from: path.join(__dirname, "../node_modules/@connext/vector-contracts/dist/pure-evm_bg.wasm"),
to: path.join(__dirname, "../dist/pure-evm_bg.wasm"),
},
{
from: path.join(__dirname, "../../../node_modules/@connext/vector-merkle-tree/dist/node/index_bg.wasm"),
to: path.join(__dirname, "../dist/index_bg.wasm"),
},
],
}),
],

stats: { warnings: false },
};
25 changes: 0 additions & 25 deletions modules/browser-node/ops/webpack.config.ts

This file was deleted.

12 changes: 6 additions & 6 deletions modules/browser-node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@connext/vector-browser-node",
"version": "0.2.5-beta.18",
"version": "0.3.0-dev.0",
"author": "",
"license": "ISC",
"description": "",
Expand All @@ -12,15 +12,15 @@
"types"
],
"scripts": {
"build": "rm -rf dist && tsc",
"build": "rm -rf dist && tsc && webpack --config ops/webpack.config.js",
"start": "node dist/index.js",
"test": "nyc ts-mocha --bail --check-leaks --exit --timeout 60000 'src/**/*.spec.ts'"
},
"dependencies": {
"@connext/vector-contracts": "0.2.5-beta.18",
"@connext/vector-engine": "0.2.5-beta.18",
"@connext/vector-types": "0.2.5-beta.18",
"@connext/vector-utils": "0.2.5-beta.18",
"@connext/vector-contracts": "0.3.0-dev.0",
"@connext/vector-engine": "0.3.0-dev.0",
"@connext/vector-types": "0.3.0-dev.0",
"@connext/vector-utils": "0.3.0-dev.0",
"@ethersproject/address": "5.2.0",
"@ethersproject/bignumber": "5.2.0",
"@ethersproject/constants": "5.2.0",
Expand Down
7 changes: 0 additions & 7 deletions modules/browser-node/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import { constructRpcRequest, hydrateProviders, NatsMessagingService } from "@co
import pino, { BaseLogger } from "pino";

import { BrowserStore } from "./services/store";
import { BrowserLockService } from "./services/lock";
import { DirectProvider, IframeChannelProvider, IRpcChannelProvider } from "./channelProvider";
import { BrowserNodeError } from "./errors";
export * from "./constants";
Expand Down Expand Up @@ -108,11 +107,6 @@ export class BrowserNode implements INodeService {
config.signer.publicIdentifier,
config.logger.child({ module: "BrowserStore" }),
);
const lock = new BrowserLockService(
config.signer.publicIdentifier,
messaging,
config.logger.child({ module: "BrowserLockService" }),
);
const chainService = new VectorChainService(
store,
chainJsonProviders,
Expand Down Expand Up @@ -146,7 +140,6 @@ export class BrowserNode implements INodeService {

const engine = await VectorEngine.connect(
messaging,
lock,
store,
config.signer,
chainService,
Expand Down
64 changes: 0 additions & 64 deletions modules/browser-node/src/services/lock.ts

This file was deleted.

Loading