Upgrade to node 12 + first steps towards trading engine integration (#2)

* import contracts from maker-otc

* simple_market: use our math and ERC-20 definitions instead
expiring_market: remove ability to stop prematurely

* remove note

* step towards trading engine deployment

* fix build

* fix build

.circleci/config.yml

@@ -4,7 +4,7 @@ version: 2.1
 executors:
   smart_contracts:
     docker:
-      - image: circleci/node:10.16.0
+      - image: circleci/node:12.13.0
       - image: trufflesuite/ganache-cli
         command: ganache-cli -a 10
 
@@ -36,12 +36,15 @@ jobs:
           path: ~/repo
       - install_node_modules:
           executor: contracts
+      - run:
+          name: Setup submodules
+          command: git submodule init && git submodule update
       - run:
           name: Compile
           command: yarn compile
       - run:
           name: Deploy initial contracts
-          command: yarn migrate
+          command: yarn deploy:local
       - run:
           name: Run tests with coverage
           command: yarn coverage

.gitignore

@@ -14,3 +14,4 @@ log/*.log
 .deployment.js
 ganache.log
 .0x*
+scTopics

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "maker-otc"]
+	path = maker-otc
+	url = https://github.com/nayms/maker-otc.git

README.md

@@ -67,12 +67,21 @@ console.log(events)
 
 ## Development
 
+**Note: Requires Node 12+**
+
 Install dependencies:
 
 ```
 yarn
 ```
 
+Initialize git submodules (for maker-otc trading engine):
+
+```
+git submodule init
+git submodule update
+```
+
 First, run the dev network in a separate terminal:
 
 ```
@@ -82,7 +91,7 @@ yarn devnet
 Now deploy the contracts to it:
 
 ```
-yarn migrate
+yarn deploy:local
 ```
 
 Now you can run the tests:

migrations/2_deploy_contracts.js

@@ -24,4 +24,9 @@ module.exports = async (deployer, network, accounts) => {
   await deployer.deploy(ACL)
   await deployer.deploy(FUCImpl, ACL.address, "fucImplementation")
   await deployer.deploy(FUCDeployer, ACL.address, FUCImpl.address)
+
+  if (network !== 'coverage') {
+    const MatchingMarket = artifacts.require("./MatchingMarket.sol")
+    await deployer.deploy(MatchingMarket, '0xFFFFFFFFFFFFFFFF')
+  }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nayms/contracts",
-  "version": "1.0.0-2",
+  "version": "1.0.0",
   "description": "Nayms smart contracts",
   "main": "index.js",
   "publishConfig": {
@@ -19,8 +19,8 @@
     "profile": "MODE=profile yarn test && istanbul report lcov",
     "test": "yarn truffle test --network test",
     "trace": "MODE=trace yarn test",
-    "compile": "yarn truffle compile",
-    "migrate": "yarn truffle migrate",
+    "copy-maker-otc-artifacts": "cp maker-otc/build/contracts/*.json build/contracts",
+    "compile": "yarn truffle compile && yarn copy-maker-otc-artifacts",
     "sol-compiler": "sol-compiler",
     "sol-compiler:watch": "sol-compiler -w",
     "deploy:mainnet": "yarn truffle networks --clean && yarn truffle migrate --network mainnet && scripts/extractDeployedAddresses.js",
@@ -33,7 +33,7 @@
   "author": "Ramesh Nair <ram@hiddentao.com>",
   "license": "ISC",
   "devDependencies": {
-    "@0x/sol-compiler": "^3.1.9",
+    "@0x/sol-compiler": "^3.1.15",
     "@0x/sol-profiler": "^3.1.8",
     "@0x/sol-trace": "^2.0.14",
     "argv": "0.0.2",
@@ -63,17 +63,16 @@
     "truffle": "^5.0.40",
     "truffle-hdwallet-provider": "^1.0.0-web3one.0",
     "uuid": "^3.0.1",
-    "web3": "1.0.0-beta.33",
+    "web3": "1.2.2",
     "web3-eth-abi": "^1.0.0-beta.55",
     "web3-provider-engine": "^15.0.0",
-    "web3-utils": "^1.0.0-beta.36",
     "yargs": "^9.0.1"
   },
   "dependencies": {
     "chalk": "^2.4.2",
     "ethereum-event-logs": "^1.3.1"
   },
   "engines": {
-    "node": ">=10.15.1"
+    "node": ">=12.0.0"
   }
 }

test/acl.js

@@ -1,8 +1,7 @@
-import { toHex, toWei, sha3 } from 'web3-utils'
-
 import { ensureErc1820RegistryIsDeployed } from '../migrations/utils'
 import { extractEventArgs } from './utils'
 import { events } from '../'
+import { toHex, toWei, sha3 } from './utils/web3'
 
 const ACL = artifacts.require("./base/ACL.sol")
 

test/fuc.js

@@ -1,4 +1,4 @@
-import { toHex, toWei, sha3, asciiToHex } from 'web3-utils'
+import { toHex, toWei, sha3, asciiToHex } from './utils/web3'
 
 import {
   parseEvents,

test/fucDeployer.js

@@ -1,5 +1,4 @@
-import { toHex, toWei } from 'web3-utils'
-
+import { toHex, toWei } from './utils/web3'
 import { ensureErc1820RegistryIsDeployed } from '../migrations/utils'
 import { extractEventArgs } from './utils'
 import { events } from '../'

test/proxy.js

@@ -1,5 +1,4 @@
-import { toHex, toWei, sha3 } from 'web3-utils'
-
+import { toHex, toWei, sha3 } from './utils/web3'
 import { ensureErc1820RegistryIsDeployed } from '../migrations/utils'
 import { ADDRESS_ZERO, hdWallet } from './utils'
 import { events } from '../'

test/utils/index.js

@@ -1,10 +1,10 @@
 import { EthHdWallet } from 'eth-hd-wallet'
 import _ from 'lodash'
-import { toBN, isBN } from 'web3-utils'
 import chai from 'chai'
 import { parseLog } from 'ethereum-event-logs'
 import chaiAsPromised from 'chai-as-promised'
 
+import { toBN, isBN } from './web3'
 import { ensureErc1820RegistryIsDeployed } from '../../migrations/utils'
 
 chai.use((_chai, utils) => {

test/utils/web3.js

@@ -0,0 +1,12 @@
+const web3 = require('web3')
+
+;[
+  'toBN',
+  'isBN',
+  'toHex',
+  'toWei',
+  'sha3',
+  'asciiToHex',
+].forEach(m => {
+  exports[m] = web3.utils[m]
+})

truffle-config.js

@@ -1,3 +1,4 @@
+const { Compiler } = require('@0x/sol-compiler')
 const ProviderEngine = require("web3-provider-engine")
 const WebsocketSubprovider = require("web3-provider-engine/subproviders/websocket.js")
 const { TruffleArtifactAdapter, RevertTraceSubprovider } = require("@0x/sol-trace")