Skip to content

Commit

Permalink
chore: merge develop into main branch (#133)
Browse files Browse the repository at this point in the history
Signed-off-by: Arpit Temani <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Goran Rojovic <[email protected]>
Co-authored-by: Arpit Temani <[email protected]>
Co-authored-by: Goran Rojovic <[email protected]>
Co-authored-by: Rachit Sonthalia <[email protected]>
Co-authored-by: Arnau Bennassar <[email protected]>
Co-authored-by: Joan Esteban <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Victor Castell <[email protected]>
  • Loading branch information
9 people authored Jan 20, 2025
1 parent 4c64bba commit 49d6392
Show file tree
Hide file tree
Showing 49 changed files with 361 additions and 447 deletions.
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2
updates:
- package-ecosystem: gomod
directory: /
schedule:
interval: weekly
target-branch: develop
20 changes: 1 addition & 19 deletions .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,6 @@ jobs:
- name: Install Kurtosis CDK tools
uses: ./kurtosis-cdk/.github/actions/setup-kurtosis-cdk

- name: Install polycli
run: |
POLYCLI_VERSION="${{ vars.POLYCLI_VERSION }}"
tmp_dir=$(mktemp -d)
curl -L "https://github.com/0xPolygon/polygon-cli/releases/download/${POLYCLI_VERSION}/polycli_${POLYCLI_VERSION}_linux_amd64.tar.gz" | tar -xz -C "$tmp_dir"
mv "$tmp_dir"/* /usr/local/bin/polycli
rm -rf "$tmp_dir"
sudo chmod +x /usr/local/bin/polycli
/usr/local/bin/polycli version
- name: Setup Bats and bats libs
uses: bats-core/[email protected]

Expand Down Expand Up @@ -138,18 +128,10 @@ jobs:
with:
repository: 0xPolygon/kurtosis-cdk
path: kurtosis-cdk
ref: jhilliard/multi-pp-testing
ref: main

- name: Install Kurtosis CDK tools
uses: ./kurtosis-cdk/.github/actions/setup-kurtosis-cdk

- name: Install polycli
run: |
git clone https://github.com/0xPolygon/polygon-cli -b jhilliard/alonso
cd polygon-cli
make install
cp ~/go/bin/polycli /usr/local/bin/polycli
/usr/local/bin/polycli version

- name: Setup Bats and bats libs
uses: bats-core/[email protected]
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/test-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,9 @@ jobs:

- name: Test
run: make test-unit

# TODO: Uncomment the following lines to enable SonarCloud analysis, once the project is set up in SonarCloud
#
# - name: Analyze with SonarCloud
# uses: sonarsource/sonarcloud-github-action@master
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

- name: Analyze with SonarCloud
uses: sonarsource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
92 changes: 92 additions & 0 deletions .mockery.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
issue-845-fix: true
with-expecter: true
resolve-type-alias: false
dir: "{{ .InterfaceDir }}/../mocks"
outpkg: "mocks"
filename: "mock_{{ .InterfaceName | snakecase | lower }}.go"
mockname: "{{ .InterfaceName }}"
packages:
github.com/agglayer/aggkit/agglayer:
config:
inpackage: true
dir: "{{ .InterfaceDir }}"
outpkg: "{{ .PackageName }}"
interfaces:
AgglayerClientInterface:
config:
mockname: AgglayerClientMock
filename: mock_agglayer_client.go
github.com/agglayer/aggkit/aggoracle/chaingersender:
config:
interfaces:
EthTxManager:
configs:
- mockname: EthTxManagerMock
filename: mock_ethtxmanager.go
- mockname: EthTxManagerMock
filename: mock_ethtxmanager.go
dir: "{{ .InterfaceDir }}/../../test/helpers"
outpkg: "helpers"
L2GERManagerContract:
config:
mockname: L2GERManagerMock
filename: mock_l2germanager.go
github.com/agglayer/aggkit/aggsender/db:
config:
all: true
github.com/agglayer/aggkit/aggsender/rpc:
config:
all: true
github.com/agglayer/aggkit/aggsender/types:
config:
all: true
github.com/agglayer/aggkit/bridgesync:
config:
dir: "{{ .InterfaceDir }}/mocks"
interfaces:
ReorgDetector:
EthClienter:
github.com/agglayer/aggkit/l1infotreesync:
config:
dir: "{{ .InterfaceDir }}/mocks"
interfaces:
EthClienter:
github.com/agglayer/aggkit/reorgdetector:
config:
dir: "{{ .InterfaceDir }}"
outpkg: "{{ .PackageName }}"
mockname: "{{ .InterfaceName }}Mock"
interfaces:
EthClient:
github.com/agglayer/aggkit/rpc/client:
config:
all: true
github.com/agglayer/aggkit/rpc:
config:
dir: "{{ .InterfaceDir }}/mocks"
all: true
github.com/agglayer/aggkit/sync:
config:
dir: "{{ .InterfaceDir }}"
outpkg: "{{ .PackageName }}"
mockname: "{{ .InterfaceName }}Mock"
inpackage: true
interfaces:
ReorgDetector:
configs:
- dir: "{{ .InterfaceDir }}/../l1infotreesync/mocks"
outpkg: "mocks"
mockname: "{{ .InterfaceName }}Mock"
inpackage: false
- dir: "{{ .InterfaceDir }}"
outpkg: "{{ .PackageName }}"
mockname: "{{ .InterfaceName }}Mock"
processorInterface:
config:
mockname: "ProcessorMock"
evmDownloaderFull:
config:
mockname: "EVMDownloaderMock"
EthClienter:
config:
mockname: "L2Mock"
52 changes: 26 additions & 26 deletions Cargo.lock

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

21 changes: 8 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<img src="./.github/assets/aggkit-logo.svg#gh-light-mode-only" alt="Logo" width="100">
<img src="./.github/assets/aggkit-logo.svg#gh-dark-mode-only" alt="Logo" width="100">

## Polygon AggKit
## AggKit

**Polygon AggKit** is a modular framework that developers can use to build and deploy Pessimistic Proofs enabled chains (TBD).
**AggKit** is a modular framework that developers can use to connect networks to the AggLayer

</div>

Expand Down Expand Up @@ -59,18 +59,13 @@ Feel free to [open an issue](https://github.com/agglayer/aggkit/issues/new) if y

## License

Polygon AggKit
Copyright (c) 2024 PT Services DMCC

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Licensed under either of

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
* MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)

You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
at your option.

The SPDX license identifier for this project is `MIT OR Apache-2.0`.
2 changes: 1 addition & 1 deletion aggoracle/mocks/mock_l2germanager.go

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

File renamed without changes.

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

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

File renamed without changes.
File renamed without changes.
File renamed without changes.

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

File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 6 additions & 6 deletions aggsender/rpc/aggsender_rpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,26 @@ const (
base10 = 10
)

type aggsenderStorer interface {
type AggsenderStorer interface {
GetCertificateByHeight(height uint64) (*types.CertificateInfo, error)
GetLastSentCertificate() (*types.CertificateInfo, error)
}

type aggsenderInterface interface {
type AggsenderInterface interface {
Info() types.AggsenderInfo
}

// AggsenderRPC is the RPC interface for the aggsender
type AggsenderRPC struct {
logger *log.Logger
storage aggsenderStorer
aggsender aggsenderInterface
storage AggsenderStorer
aggsender AggsenderInterface
}

func NewAggsenderRPC(
logger *log.Logger,
storage aggsenderStorer,
aggsender aggsenderInterface,
storage AggsenderStorer,
aggsender AggsenderInterface,
) *AggsenderRPC {
return &AggsenderRPC{
logger: logger,
Expand Down

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

Loading

0 comments on commit 49d6392

Please sign in to comment.