Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.0 #589

Merged
merged 295 commits into from Nov 18, 2019
Merged

2.0 #589

merged 295 commits into from Nov 18, 2019

Conversation

@xpepermint
Copy link
Member

xpepermint commented Nov 18, 2019

No description provided.

MoMannn and others added 30 commits Jul 18, 2019
…loy-gateway

# Conflicts:
#	common/config/rush/npm-shrinkwrap.json
Gateway for deploying smart contract and mutation event parsing
MoMannn and others added 25 commits Nov 6, 2019
Rename claim to sign and add hash to gateway.
…pprove

# Conflicts:
#	dist/0xcert-ethereum-bitski-frontend-provider.min.js
Add auto approving of nftTransferProxy and xcertBurnProxy to deployment.
Bump version
Final 2.0 fixes
2.0 review fixes.
# Conflicts:
#	common/config/rush/npm-shrinkwrap.json
#	common/config/rush/version-policies.json
#	dist/0xcert-cert.min.js
#	dist/0xcert-ethereum-asset-ledger.min.js
#	dist/0xcert-ethereum-bitski-frontend-provider.min.js
#	dist/0xcert-ethereum-http-provider.min.js
#	dist/0xcert-ethereum-metamask-provider.min.js
#	dist/0xcert-ethereum-order-gateway.min.js
#	dist/0xcert-ethereum-value-ledger.min.js
#	dist/0xcert-ethereum.min.js
#	dist/0xcert-wanchain-asset-ledger.min.js
#	dist/0xcert-wanchain-http-provider.min.js
#	dist/0xcert-wanchain-order-gateway.min.js
#	dist/0xcert-wanchain-value-ledger.min.js
#	dist/0xcert-wanchain.min.js
#	docs/.vuepress/package-lock.json
#	docs/.vuepress/package.json
#	packages/0xcert-cert/CHANGELOG.json
#	packages/0xcert-cert/package.json
#	packages/0xcert-conventions/CHANGELOG.json
#	packages/0xcert-conventions/package.json
#	packages/0xcert-ethereum-asset-ledger/CHANGELOG.json
#	packages/0xcert-ethereum-asset-ledger/package.json
#	packages/0xcert-ethereum-asset-ledger/src/tests/core/ledger/update-asset-instance-method.test.ts
#	packages/0xcert-ethereum-bitski-backend-provider/CHANGELOG.json
#	packages/0xcert-ethereum-bitski-backend-provider/package.json
#	packages/0xcert-ethereum-bitski-frontend-provider/CHANGELOG.json
#	packages/0xcert-ethereum-bitski-frontend-provider/package.json
#	packages/0xcert-ethereum-erc20-contracts/CHANGELOG.json
#	packages/0xcert-ethereum-erc20-contracts/package.json
#	packages/0xcert-ethereum-erc721-contracts/CHANGELOG.json
#	packages/0xcert-ethereum-erc721-contracts/package.json
#	packages/0xcert-ethereum-gateway-contracts/CHANGELOG.json
#	packages/0xcert-ethereum-gateway-contracts/package.json
#	packages/0xcert-ethereum-gateway/CHANGELOG.json
#	packages/0xcert-ethereum-gateway/package.json
#	packages/0xcert-ethereum-generic-provider/CHANGELOG.json
#	packages/0xcert-ethereum-generic-provider/package.json
#	packages/0xcert-ethereum-http-provider/CHANGELOG.json
#	packages/0xcert-ethereum-http-provider/package.json
#	packages/0xcert-ethereum-metamask-provider/CHANGELOG.json
#	packages/0xcert-ethereum-metamask-provider/package.json
#	packages/0xcert-ethereum-proxy-contracts/CHANGELOG.json
#	packages/0xcert-ethereum-proxy-contracts/package.json
#	packages/0xcert-ethereum-sandbox/CHANGELOG.json
#	packages/0xcert-ethereum-sandbox/package.json
#	packages/0xcert-ethereum-utils-contracts/CHANGELOG.json
#	packages/0xcert-ethereum-utils-contracts/package.json
#	packages/0xcert-ethereum-utils/CHANGELOG.json
#	packages/0xcert-ethereum-utils/package.json
#	packages/0xcert-ethereum-value-ledger/CHANGELOG.json
#	packages/0xcert-ethereum-value-ledger/package.json
#	packages/0xcert-ethereum-xcert-contracts/CHANGELOG.json
#	packages/0xcert-ethereum-xcert-contracts/package.json
#	packages/0xcert-merkle/CHANGELOG.json
#	packages/0xcert-merkle/package.json
#	packages/0xcert-scaffold/CHANGELOG.json
#	packages/0xcert-scaffold/package.json
#	packages/0xcert-utils/CHANGELOG.json
#	packages/0xcert-utils/package.json
#	packages/0xcert-vue-example/package.json
#	packages/0xcert-vue-plugin/CHANGELOG.json
#	packages/0xcert-vue-plugin/package.json
#	packages/0xcert-wanchain-asset-ledger/CHANGELOG.json
#	packages/0xcert-wanchain-asset-ledger/package.json
#	packages/0xcert-wanchain-gateway/CHANGELOG.json
#	packages/0xcert-wanchain-gateway/package.json
#	packages/0xcert-wanchain-http-provider/CHANGELOG.json
#	packages/0xcert-wanchain-http-provider/package.json
#	packages/0xcert-wanchain-utils/CHANGELOG.json
#	packages/0xcert-wanchain-utils/package.json
#	packages/0xcert-wanchain-value-ledger/CHANGELOG.json
#	packages/0xcert-wanchain-value-ledger/package.json
#	packages/0xcert-webpack/package.json
Fix conflicts with master.
@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Nov 18, 2019

Codecov Report

Merging #589 into master will increase coverage by 1.81%.
The diff coverage is 78.93%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #589      +/-   ##
==========================================
+ Coverage   77.36%   79.17%   +1.81%     
==========================================
  Files         105      122      +17     
  Lines        2054     2655     +601     
  Branches      253      324      +71     
==========================================
+ Hits         1589     2102     +513     
- Misses        347      396      +49     
- Partials      118      157      +39
Impacted Files Coverage Δ
...0xcert-ethereum-generic-provider/src/core/types.ts 100% <ø> (ø) ⬆️
...rt-conventions/src/assets/88-crypto-collectible.ts 100% <ø> (ø) ⬆️
...ereum-bitski-backend-provider/src/core/provider.ts 33.33% <ø> (ø) ⬆️
...asset-ledger/src/mutations/set-approval-for-all.ts 87.5% <ø> (ø) ⬆️
...0xcert-ethereum-http-provider/src/core/provider.ts 65.21% <ø> (ø) ⬆️
...0xcert-conventions/src/assets/87-asset-evidence.ts 100% <ø> (ø) ⬆️
...ges/0xcert-conventions/src/assets/86-base-asset.ts 100% <ø> (ø) ⬆️
...rt-ethereum-metamask-provider/src/core/provider.ts 8.33% <ø> (ø) ⬆️
...ert-ethereum-generic-provider/src/core/provider.ts 60% <ø> (+15.43%) ⬆️
...thereum-asset-ledger/src/mutations/update-asset.ts 87.5% <ø> (ø) ⬆️
... and 92 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4696d4b...141f8a0. Read the comment docs.

@xpepermint xpepermint merged commit e7fc2dc into master Nov 18, 2019
4 checks passed
4 checks passed
codecov/patch 78.93% of diff hit (target 77.36%)
Details
codecov/project 79.17% (+1.81%) compared to 4696d4b
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@xpepermint xpepermint deleted the 2.0 branch Jan 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.