Commit Graph

280 Commits

Author SHA1 Message Date
arnaucube
7af6371f1d ZKInputs update:
- Add ZKInputs parser to JSON
- Update ProcessTxs to last go-merkletree version changes
- Add StateDB test to generate ZKInputs to check inside a circom circuit
- Small fix at Til CoordinatorTx.LoadAmount=0
2020-11-04 16:40:55 +01:00
arnau
11dbf67377 Merge pull request #250 from hermeznetwork/feature/integration9
Reorganize smart contract types, udate eth tests, etc.
2020-11-04 12:36:42 +01:00
Eduard S
e6fb0a03de Reorganize smart contract types, udate eth tests, etc.
- Move smart contract constants and structs for variables to
  common/{ethrollup.go, ethauction.go, ethwdelayer.go}:
    - This removes repeated code of the structs for variables
    - Allows reusing the constants and variables from all modules without
      import cycles
- Remove unused common/scvars.go
- In common.BlockData, split data from each smart contract into a sepparate
  field (Rollup, Auction, WDelayer).  This affects the structures that til uses
  as output, and HistoryDB in the AddBlockSCData.
- In Synchronizer:
    - Pass starting block of each smart contract as config, instead of
      incorrectly using the genesis block found in the acution constant (which
      has a very different meaning)
    - Use variable structs from common instead of an internal copy
    - Synchronize more stuff (resolve some TODOs)
    - Fix some issues found after initial testing with ganache
- In eth:
    - In auction.go: Add method to get constants
    - Update README to use ganache instead of buidlerevm as local blockchain
      for testing
    - Update env variables and test vectors to pass the tests with the
      deployment in the ganache testnet.
    - Use ethereum keys derived from paths (hdwallet) in testing to avoid
      hardcoding private keys and generate the same keys from a mnemonic used
      in the ganache tesnet.
2020-11-04 12:06:28 +01:00
a_bennassar
91ef32693c Merge pull request #252 from hermeznetwork/feature/api-exits-update
API add pending withdraws filter on GET /exits
2020-11-03 16:19:31 +01:00
laisolizq
04d969c274 API add pending withdraws filter on GET /exits 2020-11-03 16:12:58 +01:00
a_bennassar
954b24020c Merge pull request #248 from hermeznetwork/feature/update-fees
Update fee tables
2020-11-03 13:10:37 +01:00
Eduard S
fe23361037 Update fee tables 2020-11-03 11:26:23 +01:00
Eduard S
1ad4f7ded5 Merge pull request #245 from hermeznetwork/refactor/api-exits-and-auth
Refactor/api exits and auth
2020-11-02 15:33:40 +01:00
Arnau B
233ecc4704 Refactor api exits 2020-11-02 14:00:42 +01:00
Arnau B
8c9d13ffa5 Refactor account creation auth endpoints 2020-11-02 13:58:42 +01:00
Eduard S
8c6f5f2950 Merge pull request #247 from hermeznetwork/feature/til-sets
Add Til set w minimum flow, add balances tests at StateDB ProcessTxs, small fixes at StateDB
2020-11-02 12:55:43 +01:00
arnau
721441b5f5 Merge pull request #244 from hermeznetwork/feature/db-insert-eth-token
Insert ETH as HistoryDB token
2020-11-02 12:50:24 +01:00
arnaucube
f65a6047b4 Add Til set w minimum flow, small fixes at StateDB 2020-11-02 12:47:34 +01:00
Arnau B
cbeca0f76e Insert ETH as HistoryDB token 2020-11-02 12:09:09 +01:00
Eduard S
4524f7a4ea Merge pull request #246 from hermeznetwork/feature/api-full-batch
Imp api get full-batches
2020-10-30 16:41:24 +01:00
Arnau B
e0e3299d9f Imp api get full-batches 2020-10-30 16:26:33 +01:00
Eduard S
04276a4d2a Merge pull request #241 from hermeznetwork/feature/statedb-tests-up
ProcessTxs fees collct update & tests, and other:
2020-10-30 14:22:52 +01:00
a_bennassar
8c15a16dea Merge pull request #237 from hermeznetwork/feature/api-bids
API add bids endpoint
2020-10-28 18:16:36 +01:00
laisolizq
aa6cb6f818 API add bids endpoint 2020-10-28 18:11:52 +01:00
arnaucube
2338b6b90b ProcessTxs fees collct update & tests, and other:
- Update StateDB ProcessTxs fees collection
- Update ProcessTxs tests to last StateDB & Til changes
- Til Blockchain L2Txs remove Nonce generation, update tests accordingly
- Update Til Set to test fees
2020-10-28 17:21:12 +01:00
Eduard S
90db8a1106 Merge pull request #236 from hermeznetwork/refactor/api-txs
Refactor/api txs
2020-10-28 14:48:44 +01:00
arnau
2ded8c8747 Merge pull request #238 from hermeznetwork/feature/integration8
Add collectedFees in TxProcessor, update sync test
2020-10-28 14:32:06 +01:00
Eduard S
4eb2972b1b Add collectedFees in TxProcessor, update sync test
- In Synchronizer test, test all tx types
2020-10-28 14:24:14 +01:00
Arnau B
a329d894d2 Refactor api txs 2020-10-28 12:16:35 +01:00
laisolizq
decc4996ee Merge pull request #235 from hermeznetwork/feature/api-coordinator-refactor
API Coordinator Refactor
2020-10-28 10:20:44 +01:00
arnau
49ea8750fa Merge pull request #234 from hermeznetwork/feature/integration7
Test L2Txs, ExitTree in synchronizer
2020-10-27 19:05:36 +01:00
Eduard S
558de2737e Test L2Txs, ExitTree in synchronizer 2020-10-27 17:59:18 +01:00
Eduard S
c1b9b0be90 Merge pull request #233 from hermeznetwork/feature/sdb-idxdb-tokenid
StateDB store Idxs with TokenID at the db-key & TxSelector include L1CoordinatorTxs in selections
2020-10-27 17:58:48 +01:00
ToniRamirezM
b521a77fc5 API Coordinator Refactor 2020-10-27 17:44:22 +01:00
arnaucube
1203ab3865 TxSelector include L1CoordinatorTxs in selections 2020-10-27 17:25:41 +01:00
arnaucube
aaa71a6b11 StateDB store Idxs with TokenID at the db-key 2020-10-27 17:24:10 +01:00
Eduard S
d6d1a9c898 Merge pull request #231 from hermeznetwork/feature/statedb-createdaccounts
ProcessTxs return an array of created accounts
2020-10-27 13:51:45 +01:00
arnaucube
e09092732e Group ProcessTxs output 2020-10-27 13:48:07 +01:00
a_bennassar
e5d1143a7e Merge pull request #232 from hermeznetwork/feature/api-gettoken-update
API Update tokens endpoint
2020-10-27 13:26:57 +01:00
laisolizq
bc34f3456b API Update tokens endpoint 2020-10-27 13:23:01 +01:00
arnaucube
0ff3fb5ae7 ProcessTxs return an array of created accounts 2020-10-27 12:50:16 +01:00
a_bennassar
b320069e75 Merge pull request #229 from hermeznetwork/feature/api-getstate
Add struct get state endpoint
2020-10-27 12:30:40 +01:00
laisolizq
82ee7c6aa7 Add struct get state endpoint 2020-10-27 12:27:04 +01:00
Eduard S
23160ce4eb Merge pull request #228 from hermeznetwork/feature/fees-to-coord
Add ProcessTxs send fees to Coordinator accounts
2020-10-27 10:32:26 +01:00
arnaucube
8f24aa93c9 Add ProcessTxs send fees to Coordinator accounts 2020-10-27 10:28:32 +01:00
a_bennassar
382bcfeee1 Merge pull request #227 from hermeznetwork/feature/integration6
Update Synchroinzer and tests
2020-10-26 16:28:48 +01:00
Eduard S
b5222303c2 Update Synchroinzer and tests
- Test L1UserTxs in Synchronizer
- Test Batches in Synchronizer
- Add last_idx in `TABLE batch` in HistoryDB
- Minor updates in til to satisfy blockchain constraints
2020-10-26 16:22:40 +01:00
Eduard S
2aa5598975 Merge pull request #223 from hermeznetwork/feature/eth-remove-ERC777
Feature/eth remove erc777
2020-10-26 16:20:41 +01:00
Eduard S
79b105b497 Update importers of eth, review eth/README.md 2020-10-26 16:09:40 +01:00
Eduard S
d17cc57e1d Merge pull request #226 from hermeznetwork/feature/api-batches
Feature/api batches
2020-10-26 15:47:30 +01:00
Arnau B
28c0164525 Impl api get batch(es) 2020-10-26 12:42:05 +01:00
Arnau B
7c8f380637 Add apitypes to avoid parsing from/to DB 2020-10-26 12:41:55 +01:00
Eduard S
0e5aad4767 Merge pull request #219 from hermeznetwork/feature/api-account-creation
Impl account creation auth endpoints
2020-10-26 11:22:32 +01:00
laisolizq
2e67008142 Ethclient: add readme & test env variables 2020-10-26 11:20:22 +01:00
laisolizq
d4753c7e1b Ethclient remove ERC777 2020-10-26 11:20:22 +01:00