Merge branch 'truffle-db-mvp' into db/load-on-compile

trufflesuite · Oct 27, 2020 · 0abaefa · 0abaefa
2 parents 01e57d9 + 4db36c3
commit 0abaefa
Show file tree

Hide file tree

Showing 124 changed files with 4,684 additions and 3,584 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,6 @@ packages/**/node_modules
 node_modules
 yarn-error.log
 .vscode
-bin
 .DS_Store
 
 # truffle

diff --git a/package.json b/package.json
@@ -17,10 +17,10 @@
     "@typescript-eslint/parser": "^4.2.0",
     "coveralls": "^3.0.2",
     "eslint": "^7.9.0",
-    "husky": "^1.2.0",
+    "husky": "^4.3.0",
     "lerna": "^3.16.4",
     "lerna-update-wizard": "^0.16.0",
-    "lint-staged": "^7.3.0",
+    "lint-staged": "^10.4.2",
     "nyc": "^13.0.1",
     "prettier": "^2.0.5",
     "prs-merged-since": "^1.1.0"
@@ -39,13 +39,11 @@
   "lint-staged": {
     "*.js": [
       "prettier --write",
-      "eslint --fix",
-      "git add"
+      "eslint --fix"
     ],
     "*.ts": [
       "prettier --write",
-      "eslint --fix",
-      "git add"
+      "eslint --fix"
     ]
   }
 }
diff --git a/packages/artifactor/package.json b/packages/artifactor/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "author": "Tim Coulter",
   "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/artifactor",
-  "version": "4.0.82",
+  "version": "4.0.83",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc",
@@ -21,7 +21,7 @@
     "source-map-support": "^0.5.19"
   },
   "devDependencies": {
-    "@truffle/contract": "^4.2.26",
+    "@truffle/contract": "^4.2.27",
     "@types/fs-extra": "^8.1.0",
     "@types/lodash.assign": "^4.2.6",
     "@types/lodash.merge": "^4.6.6",
@@ -35,7 +35,7 @@
     "tmp": "^0.2.1",
     "ts-node": "8.10.2",
     "typescript": "3.9.6",
-    "web3": "1.2.1"
+    "web3": "1.2.9"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/box/package.json b/packages/box/package.json
@@ -4,7 +4,7 @@
   "license": "MIT",
   "author": "g. nicholas d'andrea <gnidan@trufflesuite.com>",
   "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/box",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "main": "dist/box.js",
   "scripts": {
     "build": "tsc",
@@ -13,7 +13,7 @@
   },
   "types": "./typings/index.d.ts",
   "dependencies": {
-    "@truffle/config": "^1.2.31",
+    "@truffle/config": "^1.2.32",
     "download-git-repo": "^3.0.2",
     "fs-extra": "^8.1.0",
     "ignore": "^5.1.8",

diff --git a/packages/codec/package.json b/packages/codec/package.json
@@ -8,7 +8,7 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "0.7.0",
+  "version": "0.7.1",
   "main": "dist/lib/index.js",
   "files": [
     "dist"
@@ -32,7 +32,7 @@
     "semver": "^6.3.0",
     "source-map-support": "^0.5.19",
     "utf8": "^3.0.0",
-    "web3-utils": "1.2.1"
+    "web3-utils": "1.2.9"
   },
   "devDependencies": {
     "@gnd/typedoc": "0.15.0-0",

diff --git a/packages/compile-solidity/package.json b/packages/compile-solidity/package.json
@@ -8,15 +8,15 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "5.0.4",
+  "version": "5.0.5",
   "main": "index.js",
   "scripts": {
     "prepare": "exit 0",
     "test": "./scripts/test.sh"
   },
   "dependencies": {
     "@truffle/compile-common": "^0.4.1",
-    "@truffle/config": "^1.2.31",
+    "@truffle/config": "^1.2.32",
     "@truffle/contract-sources": "^0.1.8",
     "@truffle/error": "^0.0.11",
     "@truffle/expect": "^0.0.15",
@@ -32,7 +32,7 @@
     "solc": "^0.6.0"
   },
   "devDependencies": {
-    "@truffle/resolver": "^6.0.23",
+    "@truffle/resolver": "^6.0.24",
     "babel-core": "^6.26.0",
     "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.1",

diff --git a/packages/compile-vyper/package.json b/packages/compile-vyper/package.json
@@ -4,20 +4,20 @@
   "license": "MIT",
   "author": "Evgeniy Filatov <evgeniyfilatov@gmail.com>",
   "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/compile-vyper",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "main": "index.js",
   "scripts": {
     "prepare": "exit 0",
     "test": "mocha"
   },
   "dependencies": {
-    "@truffle/compile-solidity": "^5.0.4",
+    "@truffle/compile-solidity": "^5.0.5",
     "colors": "^1.1.2",
     "eslint": "^5.5.0",
     "minimatch": "^3.0.4"
   },
   "devDependencies": {
-    "@truffle/config": "^1.2.31",
+    "@truffle/config": "^1.2.32",
     "mocha": "8.1.2"
   },
   "keywords": [

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -8,7 +8,7 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "1.2.31",
+  "version": "1.2.32",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc",
@@ -19,7 +19,7 @@
   "dependencies": {
     "@truffle/error": "^0.0.11",
     "@truffle/events": "^0.0.8",
-    "@truffle/provider": "^0.2.23",
+    "@truffle/provider": "^0.2.24",
     "configstore": "^4.0.0",
     "find-up": "^2.1.0",
     "lodash.assignin": "^4.2.0",

diff --git a/packages/contract-tests/package.json b/packages/contract-tests/package.json
@@ -1,35 +1,35 @@
 {
+  "private": true,
   "name": "@truffle/contract-tests",
-  "version": "0.1.8",
   "description": "Test suite for @truffle/contract smart contract abstraction (unpublished)",
+  "license": "MIT",
   "author": "g. nicholas d'andrea <gnidan@trufflesuite.com>",
   "homepage": "https://github.com/trufflesuite/truffle#readme",
-  "license": "MIT",
-  "private": true,
   "repository": {
     "type": "git",
     "url": "git+https://github.com/trufflesuite/truffle.git"
   },
+  "bugs": {
+    "url": "https://github.com/trufflesuite/truffle/issues"
+  },
+  "version": "0.1.9",
   "scripts": {
     "prepare": "exit 0",
     "test": "./scripts/test.sh",
     "test:debug": "$(yarn bin)/mocha --inspect-brk",
     "test:trace": "$(yarn bin)/mocha --trace-warnings"
   },
-  "bugs": {
-    "url": "https://github.com/trufflesuite/truffle/issues"
-  },
   "devDependencies": {
     "@truffle/blockchain-utils": "^0.0.25",
-    "@truffle/compile-solidity": "^5.0.4",
-    "@truffle/contract": "^4.2.26",
+    "@truffle/compile-solidity": "^5.0.5",
+    "@truffle/contract": "^4.2.27",
     "bignumber.js": "^7.2.1",
     "chai": "4.2.0",
     "debug": "^4.1.0",
     "ganache-core": "2.13.0",
     "mocha": "8.0.1",
     "sinon": "9.0.2",
-    "web3": "1.2.1",
-    "web3-core-promievent": "1.2.1"
+    "web3": "1.2.9",
+    "web3-core-promievent": "1.2.9"
   }
 }
diff --git a/packages/contract-tests/test/errors.js b/packages/contract-tests/test/errors.js
@@ -310,19 +310,19 @@ describe("Client appends errors (vmErrorsOnRPCResponse)", function () {
         assert.fail();
       } catch (e) {
         assert(
-          e.stack.includes("Error: invalid number value ("),
+          e.stack.includes("Error: invalid BigNumber string"),
           "Should keep hijacked error description"
         );
         assert(
           e.stack.includes("/test/errors.js:"),
           "Should include original stack details"
         );
         assert(
-          e.hijackedStack.includes("Error: invalid number value ("),
+          e.hijackedStack.includes("Error: invalid BigNumber string"),
           "Should preserve hijacked error message"
         );
         assert(
-          e.hijackedStack.includes("/utils/abi-coder.js:"),
+          e.hijackedStack.includes("/lib/abi-coder.js:"),
           "Should preserve hijacked stack details"
         );
       }

diff --git a/packages/contract/package.json b/packages/contract/package.json
@@ -8,7 +8,7 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "4.2.26",
+  "version": "4.2.27",
   "main": "index.js",
   "scripts": {
     "compile": "sh -c \"mkdir -p ./dist\" && browserify --debug ./index.js | exorcist ./dist/truffle-contract.js.map > ./dist/truffle-contract.js && uglifyjs ./dist/truffle-contract.js -o ./dist/truffle-contract.min.js",
@@ -19,18 +19,18 @@
   "dependencies": {
     "@truffle/blockchain-utils": "^0.0.25",
     "@truffle/contract-schema": "^3.3.1",
-    "@truffle/debug-utils": "^4.2.12",
+    "@truffle/debug-utils": "^4.2.13",
     "@truffle/error": "^0.0.11",
-    "@truffle/interface-adapter": "^0.4.17",
+    "@truffle/interface-adapter": "^0.4.18",
     "bignumber.js": "^7.2.1",
     "ethereum-ens": "^0.8.0",
     "ethers": "^4.0.0-beta.1",
     "source-map-support": "^0.5.19",
-    "web3": "1.2.1",
-    "web3-core-helpers": "1.2.1",
-    "web3-core-promievent": "1.2.1",
-    "web3-eth-abi": "1.2.1",
-    "web3-utils": "1.2.1"
+    "web3": "1.2.9",
+    "web3-core-helpers": "1.2.9",
+    "web3-core-promievent": "1.2.9",
+    "web3-eth-abi": "1.2.9",
+    "web3-utils": "1.2.9"
   },
   "devDependencies": {
     "browserify": "^14.0.0",

diff --git a/packages/core/lib/testing/TestRunner.js b/packages/core/lib/testing/TestRunner.js
@@ -41,7 +41,7 @@ class TestRunner {
 
   async initialize() {
     debug("initializing");
-    this.config.resolver = new Resolver(config, true);
+    this.config.resolver = new Resolver(this.config, true);
 
     if (this.first_snapshot) {
       debug("taking first snapshot");

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -7,7 +7,7 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "5.1.49",
+  "version": "5.1.50",
   "bin": {
     "truffle": "./cli.js",
     "truffle-exec": "./exec.js"
@@ -17,28 +17,28 @@
     "test": "mocha ./test/** ./test/**/*"
   },
   "dependencies": {
-    "@truffle/artifactor": "^4.0.82",
-    "@truffle/box": "^2.1.2",
-    "@truffle/codec": "^0.7.0",
-    "@truffle/compile-solidity": "^5.0.4",
-    "@truffle/config": "^1.2.31",
-    "@truffle/contract": "^4.2.26",
+    "@truffle/artifactor": "^4.0.83",
+    "@truffle/box": "^2.1.3",
+    "@truffle/codec": "^0.7.1",
+    "@truffle/compile-solidity": "^5.0.5",
+    "@truffle/config": "^1.2.32",
+    "@truffle/contract": "^4.2.27",
     "@truffle/contract-sources": "^0.1.8",
-    "@truffle/debug-utils": "^4.2.12",
-    "@truffle/debugger": "^7.7.5",
-    "@truffle/decoder": "^4.4.6",
-    "@truffle/deployer": "^3.1.43",
-    "@truffle/environment": "^0.2.29",
+    "@truffle/debug-utils": "^4.2.13",
+    "@truffle/debugger": "^7.7.6",
+    "@truffle/decoder": "^4.4.7",
+    "@truffle/deployer": "^3.1.44",
+    "@truffle/environment": "^0.2.30",
     "@truffle/error": "^0.0.11",
     "@truffle/expect": "^0.0.15",
-    "@truffle/interface-adapter": "^0.4.17",
-    "@truffle/migrate": "^3.1.43",
-    "@truffle/provider": "^0.2.23",
-    "@truffle/provisioner": "^0.2.8",
-    "@truffle/require": "^2.0.54",
-    "@truffle/resolver": "^6.0.23",
+    "@truffle/interface-adapter": "^0.4.18",
+    "@truffle/migrate": "^3.1.44",
+    "@truffle/provider": "^0.2.24",
+    "@truffle/provisioner": "^0.2.9",
+    "@truffle/require": "^2.0.55",
+    "@truffle/resolver": "^6.0.24",
     "@truffle/source-fetcher": "^0.2.4",
-    "@truffle/workflow-compile": "^3.0.4",
+    "@truffle/workflow-compile": "^3.0.5",
     "app-module-path": "^2.2.0",
     "chai": "4.2.0",
     "colors": "^1.1.2",
@@ -68,8 +68,8 @@
     "spawn-args": "^0.1.0",
     "tmp": "^0.2.1",
     "universal-analytics": "^0.4.17",
-    "web3": "1.2.1",
-    "web3-utils": "1.2.1",
+    "web3": "1.2.9",
+    "web3-utils": "1.2.9",
     "xregexp": "^4.2.4",
     "yargs": "^8.0.2"
   },

diff --git a/packages/db/.madgerc b/packages/db/.madgerc
@@ -0,0 +1,5 @@
+{
+  "excludeRegExp": ["\\.\\.", "test", "logger.ts"],
+  "fileExtensions": ["ts"],
+  "tsConfig": "./tsconfig.base.json"
+}
diff --git a/packages/db/bin/build b/packages/db/bin/build
diff --git a/packages/db/bin/codegen.js b/packages/db/bin/codegen.js
@@ -2,13 +2,18 @@ const fs = require("fs");
 const path = require("path");
 const { generateNamespace } = require("@gql2ts/from-schema");
 
-// for path setup
-require("@truffle/db");
+const { schema } = require("@truffle/db/dist/src/schema");
 
-const { schema } = require("@truffle/db/data/schema");
-
-const dataModel = generateNamespace("DataModel", schema, {
-  ignoreTypeNameDeclaration: true
-});
+const dataModel = generateNamespace(
+  "DataModel",
+  schema,
+  {
+    ignoreTypeNameDeclaration: true,
+    ignoredTypes: ["Resource", "Named"]
+  },
+  {
+    generateInterfaceName: name => name
+  }
+);
 
 fs.writeFileSync(path.join(__dirname, "..", "types", "schema.d.ts"), dataModel);