remove src path

package.json

@@ -2,10 +2,11 @@
   "name": "@gnosis.pm/dex-contracts",
   "version": "0.2.15",
   "description": "Contracts for dFusion multi-token batch auction exchange",
-  "main": "build/commonjs/index.ts",
-  "module": "build/esm/index.js",
-  "jsnext:main": "build/esm/index.js",
+  "main": "build/common/src/index.ts",
+  "types": "build/common/src/index.d.ts",
   "ts:main": "src/index.ts",
+  "module": "build/esm/src/index.js",
+  "jsnext:main": "build/esm/src/index.js",
   "directories": {
     "test": "test"
   },

src/contracts.ts

@@ -9,8 +9,6 @@
  * @packageDocumentation
  */
 
-import { TransactionReceipt } from "web3-core";
-import { Contract } from "web3-eth-contract";
 import { AbiItem } from "web3-utils";
 
 export { BatchExchange } from "../build/types/BatchExchange";
@@ -28,26 +26,3 @@ export interface ContractArtifact {
     };
   };
 }
-
-/**
- * Get a contract deployment, returning both the web3 contract object as well as
- * the transaction receipt for the contract deployment.
- *
- * @throws If the contract is not deployed on the network the web3 provider is
- * connected to.
- */
-export async function deployment<C extends Contract>(
-  web3: Web3,
-  { abi, networks }: ContractArtifact,
-): Promise<[C, TransactionReceipt]> {
-  const chainId = await web3.eth.getChainId();
-  const network = networks[chainId];
-  if (!networks) {
-    throw new Error(`not deployed on network with chain ID ${chainId}`);
-  }
-
-  const tx = await web3.eth.getTransactionReceipt(network.transactionHash);
-  const contract = new web3.eth.Contract(abi, network.address);
-
-  return [contract as C, tx];
-}

src/index.ts

@@ -14,5 +14,5 @@ export * from "./fraction";
 export * from "./orderbook";
 export * from "./streamed";
 
-export * from "./encoding";
-export * from "./onchain_reading";
+export * from "./encoding.js";
+export * from "./onchain_reading.js";

src/streamed/index.ts

@@ -14,12 +14,12 @@
  */
 
 import Web3 from "web3";
-import { BlockNumber } from "web3-core";
+import { BlockNumber, TransactionReceipt } from "web3-core";
+import { Contract } from "web3-eth-contract";
 import {
   BatchExchange,
   BatchExchangeArtifact,
   ContractArtifact,
-  deployment,
 } from "../contracts";
 import { IndexedOrder } from "../encoding";
 import { AnyEvent } from "./events";
@@ -306,3 +306,26 @@ export class InvalidAuctionStateError extends Error {
     super(`invalid auction state at block ${block}: ${inner.message}`);
   }
 }
+
+/**
+ * Get a contract deployment, returning both the web3 contract object as well as
+ * the transaction receipt for the contract deployment.
+ *
+ * @throws If the contract is not deployed on the network the web3 provider is
+ * connected to.
+ */
+export async function deployment<C extends Contract>(
+  web3: Web3,
+  { abi, networks }: ContractArtifact,
+): Promise<[C, TransactionReceipt]> {
+  const chainId = await web3.eth.getChainId();
+  const network = networks[chainId];
+  if (!networks) {
+    throw new Error(`not deployed on network with chain ID ${chainId}`);
+  }
+
+  const tx = await web3.eth.getTransactionReceipt(network.transactionHash);
+  const contract = new web3.eth.Contract(abi, network.address);
+
+  return [contract as C, tx];
+}

test/models/streamed/index.spec.ts

@@ -12,7 +12,7 @@ import {
   StreamedOrderbook,
   deployment,
   getOpenOrders,
-} from "@src/index";
+} from "../../../src";
 
 describe("Streamed Orderbook", () => {
   describe("init", () => {

test/models/streamed/state.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from "chai";
-import { BatchExchange, DEFAULT_ORDERBOOK_OPTIONS } from "@src/index";
-import { AuctionState } from "@src/streamed/state";
-import { AnyEvent, EventName, EventValues } from "@src/streamed/events";
+import { BatchExchange, DEFAULT_ORDERBOOK_OPTIONS } from "../../../src";
+import { AuctionState } from "../../../src/streamed/state";
+import { AnyEvent, EventName, EventValues } from "../../../src/streamed/events";
 
 function auctionState(): AuctionState {
   return new AuctionState({ ...DEFAULT_ORDERBOOK_OPTIONS, strict: true });

tsconfig.json

@@ -8,7 +8,7 @@
     // "allowJs": true,                       /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */
     // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    "declaration": true,                   /* Generates corresponding '.d.ts' file. */
     // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
     // "sourceMap": true,                     /* Generates corresponding '.map' file. */
     // "outFile": "./",                       /* Concatenate and emit output to single file. */
@@ -40,10 +40,8 @@
 
     /* Module Resolution Options */
     "moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
-    "baseUrl": "./",
-    "paths": {
-      "@src/*": ["./src/*"],
-    },
+    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
     // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
     // "typeRoots": [],
     //"allowSyntheticDefaultImports": true    /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */,