Merge branch 'master' of https://github.com/0xcert/framework into dep…

…loy-gateway
0xcert · Jul 17, 2019 · 0895dbb · 0895dbb
2 parents f3bc828 + c593ed6
commit 0895dbb
Show file tree

Hide file tree

Showing 31 changed files with 68 additions and 37 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,5 +16,5 @@ after_success:
   # code coverage & codecov upload
   - rm -Rf .nyc_output && mkdir -p .nyc_output
   - find packages/**/.nyc_output -type f -name '*.json' -exec cp '{}' .nyc_output \;
-  - npx nyc report --reporter=text-lcov > .nyc_output/coverage.lcov
+  - npx nyc report --extension=.ts --reporter=text-lcov > .nyc_output/coverage.lcov
   - codecov
diff --git a/INTERFACE.md b/INTERFACE.md
@@ -8,7 +8,7 @@ import { GenericProvider } from '@0xcert/ethereum-generic-provider';
 const provider = new GenericProvider({
   provider: window.ethereum,
   accountId: '',
-  signMethod: 2,
+  signMethod: SignMethod.EIP712,
 });
 provider.isSupported();
 await provider.enable();

diff --git a/docs/api/wanchain.md b/docs/api/wanchain.md
@@ -2329,12 +2329,12 @@ This are latest addresses that work with version 1.5.0. For older addresses that
 
 | Contract | Address
 |-|-|-
-| OrderGateway | [0x1d3fd1eA89510Ab49FFFE160Ee166dd08d0d079C](http://testnet.wanscan.org/address/0x1d3fd1eA89510Ab49FFFE160Ee166dd08d0d079C)
-| TokenTransferProxy | [0xB827222B89BA5237c432c47B4ef7d2079641A075](http://testnet.wanscan.org/address/0xB827222B89BA5237c432c47B4ef7d2079641A075)
-| NFTokenTransferProxy | [0xB59A801024393eB92b38a0711a54579c0136347A](http://testnet.wanscan.org/address/0xB59A801024393eB92b38a0711a54579c0136347A)
-| NFTokenSafeTransferProxy | [0x84907deF46A2D0fc80035f1c08A722f2432e9801](http://testnet.wanscan.org/address/0x84907deF46A2D0fc80035f1c08A722f2432e9801)
-| XcertCreateProxy | [0xB56F60874aCC5a0b0D318Bf7D15A63CA0122118D](http://testnet.wanscan.org/address/0xB56F60874aCC5a0b0D318Bf7D15A63CA0122118D)
-| XcertUpdateProxy | [0xf73b617c55a3519F2c832cFb707363Ee609e3495](http://testnet.wanscan.org/address/0xf73b617c55a3519F2c832cFb707363Ee609e3495)
+| OrderGateway | [0x90A8D7e2138ABB28393906Ae162238B5A18fE846](http://testnet.wanscan.org/address/0x90A8D7e2138ABB28393906Ae162238B5A18fE846)
+| TokenTransferProxy | [0x7E8c8e87e548598A1e318Bc105f91A94b814d6fA](http://testnet.wanscan.org/address/0x7E8c8e87e548598A1e318Bc105f91A94b814d6fA)
+| NFTokenTransferProxy | [0xE1d56574ea7af7A20cA83FB3cdB68b52bb1d9EAC](http://testnet.wanscan.org/address/0xE1d56574ea7af7A20cA83FB3cdB68b52bb1d9EAC)
+| NFTokenSafeTransferProxy | [0xE2AFE8d5131B25Eba0410f68eC620bF43BbaAC08](http://testnet.wanscan.org/address/0xE2AFE8d5131B25Eba0410f68eC620bF43BbaAC08)
+| XcertCreateProxy | [0xF3e68b923FEaEB6F2fa6Fa84025910018a6092c6](http://testnet.wanscan.org/address/0xF3e68b923FEaEB6F2fa6Fa84025910018a6092c6)
+| XcertUpdateProxy | [0x4B6eFA47223a14d22fDBD47ce617E0Ade90aD053](http://testnet.wanscan.org/address/0x4B6eFA47223a14d22fDBD47ce617E0Ade90aD053)
 
 ### Archive
 

diff --git a/docs/guide/atomic-orders.md b/docs/guide/atomic-orders.md
@@ -1,6 +1,6 @@
 # Atomic orders
 
-If you want to exchange assets with someone in a trustless way, not depending on a third party nor accepting counterparty risk, atomic orderr are the way to go.
+If you want to exchange assets with someone in a trustless way, not depending on a third party nor accepting counterparty risk, atomic orders are the way to go.
 
 Atomic order is a way of creating an atomic swap within the 0xcert Framework. It is a set of instructions for what you will execute in a single mutation and with only two possible results. Either the mutation will succeed and all participants will receive their assets, or the mutation will fail and the operation will return to its starting point.
 

diff --git a/packages/0xcert-cert/tsconfig.json b/packages/0xcert-cert/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-cert/tslint.json b/packages/0xcert-cert/tslint.json
@@ -109,8 +109,13 @@
     "no-bitwise": true,
     "use-isnan": true,
     "no-conditional-assignment": true,
+    "prefer-conditional-expression": [
+      true,
+      "check-else-if"
+    ],
     "prefer-while": true,
     "prefer-for-of": true,
+    "forin": true,
     "switch-default": true,
     "no-switch-case-fall-through": true,
     "no-duplicate-switch-case": true,

diff --git a/packages/0xcert-conventions/tsconfig.json b/packages/0xcert-conventions/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-ethereum-asset-ledger/tsconfig.json b/packages/0xcert-ethereum-asset-ledger/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-ethereum-bitski-frontend-provider/tsconfig.json b/packages/0xcert-ethereum-bitski-frontend-provider/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-ethereum-deploy-gateway-contracts/tsconfig.json b/packages/0xcert-ethereum-deploy-gateway-contracts/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-ethereum-erc20-contracts/tsconfig.json b/packages/0xcert-ethereum-erc20-contracts/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-ethereum-erc721-contracts/tsconfig.json b/packages/0xcert-ethereum-erc721-contracts/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-ethereum-gateway/tsconfig.json b/packages/0xcert-ethereum-gateway/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-ethereum-generic-provider/tsconfig.json b/packages/0xcert-ethereum-generic-provider/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-ethereum-http-provider/tsconfig.json b/packages/0xcert-ethereum-http-provider/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-ethereum-metamask-provider/tsconfig.json b/packages/0xcert-ethereum-metamask-provider/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-ethereum-order-gateway-contracts/tsconfig.json b/packages/0xcert-ethereum-order-gateway-contracts/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-ethereum-proxy-contracts/tsconfig.json b/packages/0xcert-ethereum-proxy-contracts/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-ethereum-sandbox/tsconfig.json b/packages/0xcert-ethereum-sandbox/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
-}
+}
diff --git a/packages/0xcert-ethereum-utils-contracts/tsconfig.json b/packages/0xcert-ethereum-utils-contracts/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-ethereum-utils/tsconfig.json b/packages/0xcert-ethereum-utils/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-ethereum-value-ledger/tsconfig.json b/packages/0xcert-ethereum-value-ledger/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-ethereum-xcert-contracts/tsconfig.json b/packages/0xcert-ethereum-xcert-contracts/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-merkle/tsconfig.json b/packages/0xcert-merkle/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-scaffold/tsconfig.json b/packages/0xcert-scaffold/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
-}
+}
diff --git a/packages/0xcert-utils/tsconfig.json b/packages/0xcert-utils/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-vue-plugin/tsconfig.json b/packages/0xcert-vue-plugin/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-wanchain-asset-ledger/tsconfig.json b/packages/0xcert-wanchain-asset-ledger/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-wanchain-http-provider/tsconfig.json b/packages/0xcert-wanchain-http-provider/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-wanchain-utils/tsconfig.json b/packages/0xcert-wanchain-utils/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/packages/0xcert-wanchain-value-ledger/tsconfig.json b/packages/0xcert-wanchain-value-ledger/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true
   }
 }