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.

Sign up for GitHub

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

Jump to bottom

Adapter calculate and retrieve total spendable amount #385

Merged
merged 69 commits into from
May 17, 2021
Merged

Adapter calculate and retrieve total spendable amount #385

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
0a9eda9
early draft of get_spendable() function
simzzz Mar 11, 2021
009dde8
changed a wrong parameter
simzzz Mar 12, 2021
641d1ad
change the way minimum deposit is retrieved
simzzz Mar 12, 2021
c73bf12
progress made for ethereum adapter
simzzz Mar 15, 2021
9ab853c
updated /lib/protocol-eth
simzzz Mar 15, 2021
4c2b143
Done with Ethereum Adapter
simzzz Mar 15, 2021
d8d079b
Better error for TokenNotWhitelisted
simzzz Mar 15, 2021
3c1b9fa
added Deposit type + fixes
simzzz Mar 18, 2021
740f4ec
Merge branch 'aip-61-adex-v5' into issue-380-adapter-total-spendable-…
simzzz Mar 18, 2021
1da31ba
Merged new Channel/Campaign PR + more fixes
simzzz Mar 19, 2021
b27a128
changed total + pending variables to be BigNum
simzzz Mar 19, 2021
b7e7af8
Done with deserialization + tests passing + cargo fmt/clippy
simzzz Mar 19, 2021
33dcd4c
renaming + updating protocol-eth
simzzz Mar 24, 2021
8ac2305
updated submodules
simzzz Mar 24, 2021
e912f4f
minor changes
simzzz Mar 24, 2021
2dd1692
fixed some unwraps
simzzz Mar 25, 2021
3beccae
Simplified deserialization of token whitelist
simzzz Mar 25, 2021
24ac6fa
Merge branch 'aip-61-adex-v5' into issue-380-adapter-total-spendable-…
simzzz Mar 26, 2021
4894910
binded import to a different name + merged main v5 branch
simzzz Mar 26, 2021
e8dfe27
adde ERC20.json to the adapter temporarily
simzzz Mar 29, 2021
133a9a5
formatting and removed unwrap
simzzz Mar 29, 2021
84e60fd
Fixes from PR review
simzzz Mar 29, 2021
10ef8e1
Removed whitelist for dev.toml causing a test to fail
simzzz Mar 29, 2021
fc68d42
more fixes from PR
simzzz Mar 29, 2021
3f28104
dummy adapter + integration tests
simzzz Apr 12, 2021
780422e
cargo fmt + realistic test spender address
simzzz Apr 12, 2021
a8a70dc
comitting progress with smart contracts
simzzz Apr 14, 2021
aaa1c61
Merge branch 'aip-61-adex-v5' into merge-aip-61-into-issue-380
elpiel Apr 14, 2021
5b69723
fix merge issues
elpiel Apr 14, 2021
7960407
Merge pull request #397 from AdExNetwork/merge-aip-61-into-issue-380
elpiel Apr 15, 2021
452bef9
changes to the dummy adapter
simzzz Apr 15, 2021
d51dc03
Merge branch 'aip-61-adex-v5' of https://github.com/AdExNetwork/adex-…
simzzz Apr 15, 2021
add80cc
Update protocol-eth
simzzz Apr 15, 2021
f91778e
Merge branch 'aip-61-adex-v5' into issue-380-adapter-total-spendable-…
simzzz Apr 15, 2021
5bb928a
changes from merge
simzzz Apr 15, 2021
b12f7fb
Merge branch 'issue-380-adapter-total-spendable-amount' of https://gi…
simzzz Apr 15, 2021
eb231ac
fixed salt
simzzz Apr 16, 2021
235a105
create2 address should be generated successfully right now
simzzz Apr 23, 2021
015af58
removed obsolete comment
simzzz Apr 27, 2021
172fd62
Added additional test
simzzz Apr 28, 2021
8c92f01
uncommented code that was commented out while testing
simzzz Apr 28, 2021
ca25335
changes to bytecode files and tests
simzzz Apr 28, 2021
fc5d58e
scripts - ethereum - ganache-cli - setup accs with priv keys
elpiel May 5, 2021
eecbb4f
Merge branch 'aip-61-adex-v5' into issue-380-adapter-total-spendable-…
elpiel May 10, 2021
9b905ed
primitives - Config - add outpace & sweeper addresses
elpiel May 10, 2021
b51619e
adapter - Ethereum - fix get_deposit & test it
elpiel May 10, 2021
8182c1c
- Address - fix var name
elpiel May 10, 2021
8c5bb9b
git - update protocol-eth submodule
elpiel May 10, 2021
f2b2fa2
adapter - use `protocol-eth` ABI & bytecode paths
elpiel May 10, 2021
7fa7317
adapter - ethereum - fix outpace & sweeper bytecode paths for tests
elpiel May 10, 2021
59ba82b
rustfmt
elpiel May 10, 2021
cd1a014
adapter - ethereum - add Sweeper contract sweep test case
elpiel May 11, 2021
766ab9e
adapter - dummy - impl mocking of deposit calls
elpiel May 11, 2021
8bec0f3
adapter - ethereum - move setup fns to `mod test_utils`
elpiel May 11, 2021
1ffcbfe
adapter - remove `EthereumChannel` struct
elpiel May 11, 2021
7cdfeb5
primitives - Adapter - remove `validate_channel`
elpiel May 11, 2021
06484f1
adapter - cleanup old code
elpiel May 11, 2021
994382b
adapter - ethereum - contrafactual address clean up
elpiel May 11, 2021
5337871
adapter - remove ChannelValidator & clean up code
elpiel May 12, 2021
d62024d
WIP try to fix sweeper_sweep
elpiel May 12, 2021
11b6e65
fix: sweeper test case
samparsky May 13, 2021
886cea0
fix: remove println
samparsky May 13, 2021
5a2997e
fix: out of gaserrors
samparsky May 14, 2021
16f11be
update: Outpace bytecode file
samparsky May 14, 2021
badeece
git - Update protocol-eth
elpiel May 14, 2021
e345f2b
Merge pull request #402 from samparsky/fix-sweeper-testcase
elpiel May 17, 2021
b027171
update protocol-eth
elpiel May 17, 2021
0752b29
remove empty file that Sam introduced
elpiel May 17, 2021
a466d7f
adapter - ethereum - remove todos
elpiel May 17, 2021
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
3 changes: 2 additions & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[submodule "lib/protocol-eth"]
path = lib/protocol-eth
url = https://github.com/AdExNetwork/adex-protocol-eth
url = https://github.com/AdExNetwork/adex-protocol-eth/
branch = guardian-separate-claim
Loading