Skip to content

Commit 9c76970

Browse files
authored
Merge pull request #383 from AdExNetwork/issue-382-channel-and-campaign
AdEx v5: Issue #382 Channel and Campaign
2 parents c85fb5b + 564ba9c commit 9c76970

File tree

10 files changed

+795
-189
lines changed

10 files changed

+795
-189
lines changed

Cargo.lock

+122-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

primitives/Cargo.toml

+8-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ serde = { version = "^1.0", features = ['derive'] }
1313
serde_json = "1.0"
1414
serde-hex = "0.1.0"
1515
serde_millis = "0.1.1"
16-
# Used prefixes on field for targeting::Input
16+
# Used prefixes on field for targeting::Input, and `campaign::Active`
1717
serde_with = "1.6"
1818
# Configuration
1919
toml = "0.5"
@@ -25,18 +25,20 @@ slog-async = "^2.3.0"
2525
thiserror = "^1.0"
2626
chrono = { version = "0.4", features = ["serde"] }
2727
time = "0.1.42"
28+
# For encoding the Channel to a ChannelId
29+
ethabi = "13.0.0"
30+
# For the nonce U256
31+
ethereum-types = "0.11"
2832
# Macro for easier derive of Display & FromStr
2933
parse-display = "^0.4.1"
3034
# CID & multihash / multibase
3135
cid = "0.6"
3236
hex = "0.4"
3337
merkletree = "0.10.0"
34-
tiny-keccak = "1.5"
35-
rust-crypto = "0.2"
36-
url = { version = "=2.2", features = ["serde"]}
38+
tiny-keccak = { version = "^2.0", features = ["keccak"] }
39+
url = { version = "=2.2", features = ["serde"] }
3740
# Numbers - BigNum, Numbers, Traits and Derives
38-
num-bigint = { version = "^0.3", features = ["serde"] }
39-
num = "0.3"
41+
num = { version = "0.4", features = ["serde", "num-bigint"] }
4042
num-traits = "0.2"
4143
num-derive = "0.3"
4244
# Fixtures

0 commit comments

Comments
 (0)