[DNM] Auction

Makefile

@@ -34,11 +34,11 @@ log_finish=@echo $$((`date "+%s"` - `cat $(startTime)`)) > $(totalTime); rm $(st
 # Build Shortcuts
 
 default: dev
-dev: messaging node router duet trio test-runner-js
+dev: messaging node router duet trio auction 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
@@ -49,6 +49,7 @@ router-prod: node-prod router-img
 
 duet: messaging server-node-js
 trio: messaging server-node-js router-js
+auction: messaging server-node-js router-js
 
 ########################################
 # Command & Control Shortcuts
@@ -85,6 +86,13 @@ restart-trio: stop-trio
 stop-trio:
 	@bash ops/stop.sh trio
 
+start-auction: auction
+	@bash ops/start-auction.sh
+restart-auction: stop-auction
+	@bash ops/start-auction.sh
+stop-auction:
+	@bash ops/stop.sh auction	
+
 start-chains: ethprovider
 	@bash ops/start-chains.sh
 restart-chains: stop-chains

modules/auth/ops/webpack.config.js

@@ -1,3 +1,4 @@
+const CopyPlugin = require("copy-webpack-plugin");
 const path = require("path");
 
 module.exports = {
@@ -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 },
 };

modules/auth/package.json

@@ -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-beta.2",
+    "@connext/vector-utils": "0.3.0-beta.2",
     "@sinclair/typebox": "0.12.7",
     "crypto": "1.0.1",
     "fastify": "3.13.0",

modules/browser-node/ops/webpack.config.js

@@ -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 },
+};

modules/browser-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@connext/vector-browser-node",
-  "version": "0.2.5-beta.18",
+  "version": "0.3.0-beta.2",
   "author": "",
   "license": "ISC",
   "description": "",
@@ -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-beta.2",
+    "@connext/vector-engine": "0.3.0-beta.2",
+    "@connext/vector-types": "0.3.0-beta.2",
+    "@connext/vector-utils": "0.3.0-beta.2",
     "@ethersproject/address": "5.2.0",
     "@ethersproject/bignumber": "5.2.0",
     "@ethersproject/constants": "5.2.0",

modules/browser-node/src/index.ts

@@ -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";
@@ -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,
@@ -146,7 +140,6 @@ export class BrowserNode implements INodeService {
 
     const engine = await VectorEngine.connect(
       messaging,
-      lock,
       store,
       config.signer,
       chainService,
@@ -187,9 +180,18 @@ export class BrowserNode implements INodeService {
     });
     const auth = await this.channelProvider.send(rpc);
     this.logger.info({ method, response: auth }, "Received response from auth method");
+
     const [nodeConfig] = await this.getConfig();
     this.publicIdentifier = nodeConfig.publicIdentifier;
     this.signerAddress = nodeConfig.signerAddress;
+    this.logger.debug({ method }, "Method complete");
+  }
+
+  async channelSetup(params: { routerPublicIdentifier: string }): Promise<void> {
+    const method = "channelSetup";
+    this.logger.debug({ method }, "Channel Setup");
+
+    this.routerPublicIdentifier = params.routerPublicIdentifier;
     this.logger.info(
       { supportedChains: this.supportedChains, routerPublicIdentifier: this.routerPublicIdentifier, method },
       "Checking for existing channels",
@@ -603,6 +605,18 @@ export class BrowserNode implements INodeService {
     }
   }
 
+  async runAuction(
+    params: OptionalPublicIdentifier<NodeParams.RunAuction>,
+  ): Promise<Result<NodeResponses.RunAuction, BrowserNodeError>> {
+    const rpc = constructRpcRequest(ChannelRpcMethods.chan_runAuction, params);
+    try {
+      const { routerPublicIdentifier, swapRate, totalFee, quote } = await this.send(rpc);
+      return Result.ok({ routerPublicIdentifier, swapRate, totalFee, quote });
+    } catch (e) {
+      return Result.fail(e);
+    }
+  }
+
   async send(payload: EngineParams.RpcRequest): Promise<any> {
     return this.channelProvider!.send(payload);
   }