Mikelle 602e1e7634 Merge remote-tracking branch 'origin/feature/update-smart-contracts' into refactore/rollupUpdateBuckets ...

# Conflicts:
#	eth/contracts/hermez/Hermez.go

2021-03-19 14:44:16 +03:00

..

apiqueries.go

Merge pull request #644 from hermeznetwork/feature/external-delete-not-count

2021-03-18 11:44:08 +01:00

historydb_test.go

Fix API /state collected fees unmarshal

2021-03-17 15:05:23 +01:00

historydb.go

Store *big.Int as DECIMAL in sql

2021-03-18 12:53:46 +01:00

nodeinfo.go

Fix API /state collected fees unmarshal

2021-03-17 15:05:23 +01:00

views.go

fixed blockstamp naming in BucketParamsAPI

2021-03-19 12:56:57 +03:00