Skip to content

Commit 2da2dcb

Browse files
authored
Merge pull request #225 from samparsky/adex-audit
fix Ethereum adapter contract call
2 parents 760e70c + 99176c2 commit 2da2dcb

File tree

17 files changed

+1403
-569
lines changed

17 files changed

+1403
-569
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ target
44
*.iml
55
.idea
66
.old
7-
Migrant.toml
7+
Migrant.toml
8+
node_modules/

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
language: rust
22
rust:
33
- stable
4+
# add nodejs for ganche-cli
5+
node_js: "12.12.0"
46
# Need to cache the whole `.cargo` directory to keep .crates.toml for
57
# cargo-update to work
68
cache:

Cargo.lock

Lines changed: 394 additions & 440 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

adapter/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ serde = {version = "^1.0", features = ['derive']}
1414
serde_json = "1.0"
1515
serde-hex = "0.1.0"
1616
# Ethereum
17-
web3 = { git = "https://github.com/tomusdrw/rust-web3" }
17+
web3 = { git = "https://github.com/samparsky/rust-web3" }
1818
eth_checksum = "0.1.1"
19-
ethabi = "8.0.1"
19+
ethabi = { git = "https://github.com/samparsky/ethabi", branch = "graph-patches" }
2020
tiny-keccak = "1.5"
21-
parity-crypto = { version = "0.4.2", features = ["publickey"], git = "https://github.com/paritytech/parity-common" }
21+
parity-crypto = { version = "0.4.2", features = ["publickey"] }
2222
ethstore = { version = "0.2.1", git = "https://github.com/paritytech/parity-ethereum"}
2323
ethkey = { version = "0.4.0", git = "https://github.com/paritytech/parity-ethereum"}
2424
sha2 = "0.8.0"

adapter/Makefile.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[tasks.pre-test]
2+
script = [
3+
"npm install",
4+
"../scripts/ethereum.sh"
5+
]

0 commit comments

Comments
 (0)