Skip to content
Merged

Eth #2281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d08ea9d
feature(node): eRC20 and ETH support
micahriggan Aug 9, 2019
b104437
Need to call transfer, not approve
micahriggan Aug 14, 2019
0a3b957
Merge branch 'master' of github.com:bitpay/bitcore into feature/eth-m…
micahriggan Aug 20, 2019
518b467
Moving some methods out of route and into ETH CSP
micahriggan Aug 20, 2019
f6cc2e6
Centralizing the abi-decoder usage
micahriggan Aug 20, 2019
b7a5cf2
Better handling of connection issues with ETH
micahriggan Aug 21, 2019
24a7d60
feature(node): eTH blocks use the correct transform
micahriggan Aug 21, 2019
c8797ea
Adding gasLimit and gasUsed to transform
micahriggan Aug 21, 2019
44ab175
Merge branch 'master' of github.com:bitpay/bitcore into feature/eth-m…
micahriggan Aug 23, 2019
3467da0
Sparse ETH index
micahriggan Aug 23, 2019
8788277
Merge branch 'master' of github.com:bitpay/bitcore into feature/eth-m…
micahriggan Aug 23, 2019
a031a9b
Updating package-lock for web3.
micahriggan Aug 23, 2019
e9bec10
Normalizing typescript version across packages
micahriggan Aug 23, 2019
e0b822e
Use npm 6.4.1
micahriggan Aug 26, 2019
b25189d
Adding difficulty and totalDifficulty
micahriggan Aug 26, 2019
33875a5
Removing bwc
micahriggan Aug 26, 2019
dc8f42b
Adding nonce index
micahriggan Aug 27, 2019
afd34eb
Merge branch 'master' of github.com:bitpay/bitcore into feature/eth-m…
micahriggan Aug 27, 2019
5d7a183
Fixing merge conflicts
micahriggan Aug 27, 2019
7d88547
Prune mempool should mark txs that used the same nonce for the same u…
micahriggan Aug 27, 2019
9a07a99
Convert to number for eth balance
micahriggan Aug 28, 2019
819a6f6
Fixing abi-decoder logic for performance
micahriggan Aug 29, 2019
46b7893
Removing carets for bitcore-node and bitcore-client
micahriggan Aug 29, 2019
dde1afe
Merge branch 'fix/resync-script' into feature/eth-module-squashed
micahriggan Aug 29, 2019
d802dd1
Fixing merge issue from fix/repair
micahriggan Aug 29, 2019
9f3573f
Merge branch 'master' of github.com:bitpay/bitcore into feature/eth-m…
micahriggan Aug 30, 2019
8947de5
[FEAT] valid API
gabrielbazan7 Aug 28, 2019
518dee9
remove b-lib and b-lib-cash from package.json
gabrielbazan7 Aug 30, 2019
57a8d6b
Making the websocket tests more stable
micahriggan Aug 30, 2019
ec44972
Adding logging.
micahriggan Aug 30, 2019
8623688
Logging block generation
micahriggan Aug 30, 2019
621389e
Simplifying the tests.
micahriggan Sep 2, 2019
42a4b21
Updating web3 each attempt
micahriggan Sep 3, 2019
d8d6991
Merge pull request #2359 from micahriggan/fix/websocket-tests-timing
matiu Sep 3, 2019
db68b28
Merge pull request #2358 from gabrielbazan7/ref/remove-lib-libcash
matiu Sep 3, 2019
cf2b093
Adding ethereum block times on ERC20
micahriggan Sep 5, 2019
219d7bd
Merge pull request #2355 from gabrielbazan7/feat/valid
matiu Sep 6, 2019
994a9bb
Merge branch 'master' of github.com:bitpay/bitcore into feature/eth-m…
micahriggan Sep 6, 2019
18179b8
Merge conflicts resolved
micahriggan Sep 6, 2019
71bfa26
Paackage-locks were corrupted for web3 packages
micahriggan Sep 6, 2019
ee10a09
Fixing typo in transform
micahriggan Sep 10, 2019
598571a
Fixing tx not found bug
micahriggan Sep 11, 2019
9fd6be9
Removing console.log
micahriggan Sep 11, 2019
dcb5a4a
Fixing reorg issue
micahriggan Sep 12, 2019
a8d9cc7
Updating wallet import function
micahriggan Sep 12, 2019
478ea8d
Renaming to updateWallet and making updateWallet a void method
micahriggan Sep 12, 2019
55e6130
ETH BWS/BWC changes rebased on eth-module-squashed
Sep 13, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,120 changes: 588 additions & 532 deletions packages/bitcore-client/package-lock.json

Large diffs are not rendered by default.

68 changes: 34 additions & 34 deletions packages/bitcore-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,42 +19,42 @@
},
"dependencies": {
"JSONStream": "~1.3.1",
"async": "^2.5.0",
"bcrypt": "^2.0.1",
"bcryptjs": "^2.4.3",
"bitcore-lib": "^8.6.0",
"bitcore-lib-cash": "^8.6.0",
"bitcore-mnemonic": "^8.6.0",
"commander": "^2.15.1",
"crypto-wallet-core": "^8.6.0",
"elliptic": "^6.4.1",
"ethereumjs-tx": "^1.3.7",
"ethereumjs-util": "^6.0.0",
"level-js": "^4.0.0",
"leveldown": "^3.0.0",
"levelup": "^2.0.2",
"mkdirp": "^0.5.1",
"progress": "^2.0.0",
"promptly": "^3.0.3",
"request": "^2.87.0",
"request-promise-native": "^1.0.5",
"secp256k1": "^3.5.0",
"web3": "^1.0.0-beta.46"
"async": "2.5.0",
"bcrypt": "2.0.1",
"bcryptjs": "2.4.3",
"bitcore-lib": "8.6.0",
"bitcore-lib-cash": "8.6.0",
"bitcore-mnemonic": "8.6.0",
"commander": "2.15.1",
"crypto-wallet-core": "8.6.0",
"elliptic": "6.4.1",
"ethereumjs-tx": "1.3.7",
"ethereumjs-util": "6.0.0",
"level-js": "4.0.0",
"leveldown": "3.0.0",
"levelup": "2.0.2",
"mkdirp": "0.5.1",
"progress": "2.0.0",
"promptly": "3.0.3",
"request": "2.87.0",
"request-promise-native": "1.0.5",
"secp256k1": "3.5.0",
"web3": "1.0.0-beta.46"
},
"devDependencies": {
"@types/bcrypt": "^3.0.0",
"@types/bcryptjs": "^2.4.2",
"@types/elliptic": "^6.4.3",
"@types/ethereumjs-util": "^5.2.0",
"@types/node": "^10.12.15",
"@types/request": "^2.48.1",
"@types/request-promise-native": "^1.0.15",
"@types/secp256k1": "^3.5.0",
"eslint-config-airbnb-base": "^12.1.0",
"eslint-plugin-import": "^2.8.0",
"mocha": "^5.0.5",
"sinon": "^4.4.8",
"typescript": "^3.2.2"
"@types/bcrypt": "3.0.0",
"@types/bcryptjs": "2.4.2",
"@types/elliptic": "6.4.3",
"@types/ethereumjs-util": "5.2.0",
"@types/node": "10.12.15",
"@types/request": "2.48.1",
"@types/request-promise-native": "1.0.15",
"@types/secp256k1": "3.5.0",
"eslint-config-airbnb-base": "12.1.0",
"eslint-plugin-import": "2.8.0",
"mocha": "5.0.5",
"sinon": "4.4.8",
"typescript": "3.3.4000"
},
"gitHead": "012cc0216a9bc6b195035855bd17149bad41acd1"
}
16 changes: 8 additions & 8 deletions packages/bitcore-lib-cash/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading