Skip to content

Commit

Permalink
Merge branch '265-wasm-version' into 'dev'
Browse files Browse the repository at this point in the history
Fix wasm version mismatch with rosen-chains

Closes #265

See merge request ergo/rosen-bridge/ts-guard-service!212
  • Loading branch information
vorujack committed Jul 25, 2023
2 parents 0474acd + 640bbab commit af29977
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 65 deletions.
80 changes: 25 additions & 55 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@
"@rosen-bridge/rosen-extractor": "^0.1.8",
"@rosen-bridge/scanner": "^1.0.4",
"@rosen-bridge/tokens": "^0.1.12",
"@rosen-bridge/tss": "^0.1.1",
"@rosen-bridge/tss": "^1.0.0",
"@rosen-bridge/watcher-data-extractor": "^1.1.4",
"@rosen-chains/abstract-chain": "^0.1.9",
"@rosen-chains/cardano": "^0.1.10",
"@rosen-chains/cardano-koios-network": "^0.1.7",
"@rosen-chains/ergo": "^0.1.14",
"@rosen-chains/ergo-explorer-network": "^0.1.9",
"@rosen-chains/ergo-node-network": "^0.1.11",
"@rosen-chains/ergo": "^0.1.15",
"@rosen-chains/ergo-explorer-network": "^0.1.10",
"@rosen-chains/ergo-node-network": "^0.1.12",
"@sinclair/typebox": "^0.28.15",
"await-semaphore": "^0.1.3",
"axios": "^0.27.2",
Expand All @@ -58,7 +58,7 @@
"config": "^3.3.7",
"cross-env": "^7.0.3",
"discord.js": "^14.7.1",
"ergo-lib-wasm-nodejs": "^0.25.0-alpha-5b1291c",
"ergo-lib-wasm-nodejs": "^0.24.0",
"fastify": "^4.18.0",
"it-pipe": "2.0.4",
"it-pushable": "^3.1.0",
Expand Down
6 changes: 1 addition & 5 deletions src/guard/Tss.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import Dialer from '../communication/Dialer';
import { loggerFactory } from '../log/Logger';
import Configs from '../configs/Configs';
import * as childProcess from 'child_process';
import GuardPkHandler from '../handlers/GuardPkHandler';

const logger = loggerFactory(import.meta.url);
const exec = childProcess.exec;
Expand Down Expand Up @@ -73,13 +72,11 @@ class Tss {
Tss.dialer = await Dialer.getInstance();

// initialize guard detection
const requiredSign = GuardPkHandler.getInstance().requiredSign;
const signer = new EdDSA(Configs.tssKeys.secret);
Tss.guardDetection = new GuardDetection({
guardsPublicKey: Configs.tssKeys.publicKeys,
signer: signer,
submit: this.generateSubmitMessageWrapper(Tss.DETECTION_CHANNEL),
needGuardThreshold: requiredSign,
getPeerId: () => Promise.resolve(Tss.dialer.getDialerId()),
});
await Tss.guardDetection.init();
Expand All @@ -89,8 +86,7 @@ class Tss {
signer: signer,
detection: Tss.guardDetection,
guardsPk: Configs.tssKeys.publicKeys,
tssSignUrl: `${Configs.tssUrl}:${Configs.tssPort}/sign`,
threshold: requiredSign,
tssApiUrl: `${Configs.tssUrl}:${Configs.tssPort}`,
submitMsg: this.generateSubmitMessageWrapper(Tss.SIGNING_CHANNEL),
getPeerId: () => Promise.resolve(Tss.dialer.getDialerId()),
callbackUrl: Configs.tssCallBackUrl,
Expand Down

0 comments on commit af29977

Please sign in to comment.