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.

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

chore: merge develop into main branch #133

Merged
merged 22 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c37c1ac
refactor: semantic rename in evm chain ger sender (#68)
Stefan-Ethernal Dec 26, 2024
6af3a8a
fix: x86 rpm packager (#71)
goran-ethernal Dec 26, 2024
6b05a41
fix: remove .asset folder and fix the logo ref in README (#76)
Stefan-Ethernal Dec 26, 2024
a80df0e
feat: remove sequence sender (#69)
temaniarpit27 Dec 27, 2024
3c411e9
fix: CodeQL workflow (#79)
Stefan-Ethernal Dec 30, 2024
3fd1953
ci: use the higher spec github runner (#84)
Stefan-Ethernal Dec 31, 2024
d82e9dc
fix: provide retry count for last ger sync (#80)
Stefan-Ethernal Dec 31, 2024
d820b9a
feat: remove aggregator (#72)
rachit77 Dec 31, 2024
01f4eb9
ci: remove obsolete e2e tests (#88)
Stefan-Ethernal Dec 31, 2024
71e77b3
chore: update CodeQL action to version 3 in workflow (#86)
Stefan-Ethernal Dec 31, 2024
15c3b1b
feat: enable sonarcloud analysis (#95)
Stefan-Ethernal Jan 9, 2025
6bb574f
feat: use Mockery v3 yaml (#98)
temaniarpit27 Jan 13, 2025
7bbd4cb
chore: remove polygon references to the readme (#107)
arnaubennassar Jan 14, 2025
dfa7eab
fix: run scripts/local_config (#104)
joanestebanr Jan 14, 2025
0e1883c
fix: multiple pessimistic proofs e2e tests (#105)
Stefan-Ethernal Jan 15, 2025
42aed9d
chore(deps): bump golang.org/x/crypto from 0.27.0 to 0.31.0 (#64)
dependabot[bot] Jan 17, 2025
6e78b55
docs: add gitflow release lifecycle to docs (#108)
vcastellm Jan 17, 2025
118bef8
chore(deps): bump github.com/golang-jwt/jwt/v4 from 4.5.0 to 4.5.1 (#65)
dependabot[bot] Jan 17, 2025
2b91212
fix: reorg detector removes non-finalized block (#124)
goran-ethernal Jan 17, 2025
beb70d9
chore: change license (#128)
arnaubennassar Jan 17, 2025
e1b9595
chore: add Dependabot configuration for Go module updates (#129)
Stefan-Ethernal Jan 20, 2025
3cb5a22
Merge branch 'main' into chore/sync-main-with-develop
Stefan-Ethernal Jan 20, 2025
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
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.

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.

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

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
Loading