Skip to content

Commit

Permalink
Merge pull request #657 from 0xPolygonHermez/feature/mkproof-ger
Browse files Browse the repository at this point in the history
Feat: Create a new end-point to request a mk-proof by GlobalExitRoot: merkle-proof-by-ger?net_id=<net>&deposit_cnt=<deposit>&ger=<ger>
  • Loading branch information
joanestebanr authored Aug 2, 2024
2 parents c71312f + 9eab0d5 commit ec3d79a
Show file tree
Hide file tree
Showing 15 changed files with 1,548 additions and 262 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include version.mk

DOCKER_COMPOSE := docker-compose -f docker-compose.yml
DOCKER_COMPOSE := docker compose -f docker-compose.yml
DOCKER_COMPOSE_STATE_DB := zkevm-state-db
DOCKER_COMPOSE_POOL_DB := zkevm-pool-db
DOCKER_COMPOSE_RPC_DB := zkevm-rpc-db
Expand Down Expand Up @@ -304,7 +304,8 @@ generate-mocks: ## Generates mocks for the tests, using mockery tool
mockery --name=storageInterface --dir=synchronizer --output=synchronizer --outpkg=synchronizer --structname=storageMock --filename=mock_storage.go ${COMMON_MOCKERY_PARAMS}
mockery --name=bridgectrlInterface --dir=synchronizer --output=synchronizer --outpkg=synchronizer --structname=bridgectrlMock --filename=mock_bridgectrl.go ${COMMON_MOCKERY_PARAMS}
mockery --name=Tx --srcpkg=github.com/jackc/pgx/v4 --output=synchronizer --outpkg=synchronizer --structname=dbTxMock --filename=mock_dbtx.go ${COMMON_MOCKERY_PARAMS}
mockery --name=zkEVMClientInterface --dir=synchronizer --output=synchronizer --outpkg=synchronizer --structname=zkEVMClientMock --filename=mock_zkevmclient.go ${COMMON_MOCKERY_PARAMS}
mockery --name=bridgeServiceStorage --dir=server --output=server --outpkg=server --structname=bridgeServiceStorageMock --filename=mock_bridgeServiceStorage.go ${COMMON_MOCKERY_PARAMS}

rm -Rf claimtxman/mocks
export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --all --case snake --dir claimtxman/ --output claimtxman/mocks --outpkg mock_txcompressor ${COMMON_MOCKERY_PARAMS}

Expand Down
403 changes: 247 additions & 156 deletions bridgectrl/pb/query.pb.go

Large diffs are not rendered by default.

97 changes: 92 additions & 5 deletions bridgectrl/pb/query.pb.gw.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

78 changes: 52 additions & 26 deletions bridgectrl/pb/query_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ec3d79a

Please sign in to comment.