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

feat(CI): Fix runner pickup failure #4

Merged
merged 16 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions .github/workflows/arbitrator-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@ env:
jobs:
arbitrator:
name: Run Arbitrator tests
runs-on: ubuntu-8
runs-on: linux-2xl
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
ssh-key: ${{ secrets.SSH_KEY }}


- name: Install Ubuntu dependencies
run: |
Expand Down Expand Up @@ -137,9 +139,10 @@ jobs:

- name: Make arbitrator libraries
run: make -j wasm-ci-build

- name: Clippy check
run: cargo clippy --all --manifest-path arbitrator/Cargo.toml -- -D warnings

# TODO: Enable clippy check
# - name: Clippy check
# run: cargo clippy --all --manifest-path arbitrator/Cargo.toml -- -D warnings

- name: Run rust tests
run: cargo test --all --manifest-path arbitrator/Cargo.toml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/arbitrator-skip-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
jobs:
arbitrator:
name: Run Arbitrator tests
runs-on: ubuntu-latest
runs-on: linux-2xl
steps:
- name: Do nothing
run: echo "doing nothing"
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
test:
name: Go Tests
runs-on: ubuntu-8
runs-on: linux-2xl

# Creates a redis container for redis tests
services:
Expand All @@ -32,6 +32,7 @@ jobs:
uses: actions/checkout@v4
with:
submodules: true
ssh-key: ${{ secrets.SSH_KEY }}

- name: Install dependencies
run: sudo apt update && sudo apt install -y wabt gotestsum
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ on:
jobs:
analyze:
name: Analyze
if: github.repository == 'OffchainLabs/nitro' # don't run in any forks without "Advanced Security" enabled
runs-on: ubuntu-8
if: github.repository == 'Layr-Labs/nitro' # don't run in any forks without "Advanced Security" enabled
runs-on: linux-2xl
permissions:
actions: read
contents: read
Expand All @@ -46,6 +46,7 @@ jobs:
uses: actions/checkout@v4
with:
submodules: true
ssh-key: ${{ secrets.SSH_KEY }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-eigenda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
docker:
runs-on: ubuntu-latest
runs-on: linux-2xl
strategy:
matrix:
include:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
docker:
name: Docker build
runs-on: ubuntu-8
runs-on: linux-2xl
services:
# local registery
registry:
Expand All @@ -26,6 +26,7 @@ jobs:
uses: actions/checkout@v4
with:
submodules: recursive
ssh-key: ${{ secrets.SSH_KEY }}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
build_and_run:
runs-on: ubuntu-8
runs-on: linux-2xl

steps:
- name: Checkout
Expand Down
5 changes: 3 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
[submodule "nitro-testnode"]
path = nitro-testnode
url = [email protected]:Layr-Labs/nitro-testnode-private.git
[submodule "rust-kzg-bn254"]
[submodule "arbitrator/rust-kzg-bn254"]
path = arbitrator/rust-kzg-bn254
url = https://github.com/afkbyte/rust-kzg-bn254.git
url = https://github.com/Layr-Labs/rust-kzg-bn254.git
branch = epociask--better-linting
5 changes: 2 additions & 3 deletions arbitrator/prover/src/kzgbn254.rs
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@

use crate::utils::Bytes32;
use ark_ec::{AffineRepr, CurveGroup,pairing::Pairing};
use ark_ec::{AffineRepr, CurveGroup};
use kzgbn254::{
kzg::Kzg,
blob::Blob,
helpers::{remove_empty_byte_from_padded_bytes, to_fr_array}
};
use eyre::{ensure, Result};
use ark_bn254::{Bn254, G1Affine, G1Projective, G2Affine};
use ark_bn254::{G2Affine};
use num::BigUint;
use sha2::{Digest, Sha256};
use std::{convert::TryFrom, io::Write};
use ark_serialize::CanonicalSerialize;
use num::Zero;

lazy_static::lazy_static! {

Expand Down
2 changes: 0 additions & 2 deletions arbitrator/prover/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

use crate::kzg::ETHEREUM_KZG_SETTINGS;
use arbutil::PreimageType;
use ark_ec::AffineRepr;
use ark_bn254::{Fr, G1Affine, G1Projective, G2Affine};
use c_kzg::{Blob, KzgCommitment};
use kzgbn254::{
kzg::Kzg as KzgBN254,
Expand Down
1 change: 1 addition & 0 deletions arbitrator/rust-kzg-bn254
Submodule rust-kzg-bn254 added at 199155
1 change: 1 addition & 0 deletions arbitrator/wasm-libraries/go-stub/src/value.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ pub unsafe fn get_field(source: u32, field: &[u8]) -> GoValue {
}
} else if source == GO_ID {
if field == b"_pendingEvent" {
#[allow(static_mut_refs)]
if let Some(event) = &PENDING_EVENT {
let id = DynamicObjectPool::singleton()
.insert(DynamicObject::PendingEvent(event.clone()));
Expand Down
1 change: 1 addition & 0 deletions das/eigenda/eigenda.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ type EigenDA struct {
}

func NewEigenDA(rpc string) (*EigenDA, error) {
// nolint:gosec
creds := credentials.NewTLS(&tls.Config{
InsecureSkipVerify: true,
})
Expand Down
2 changes: 1 addition & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2313,4 +2313,4 @@ rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA=
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
15 changes: 15 additions & 0 deletions system_tests/full_challenge_impl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,19 @@ func setupSequencerInboxStub(ctx context.Context, t *testing.T, l1Info *Blockcha
DelaySeconds: big.NewInt(10000),
FutureSeconds: big.NewInt(10000),
}

// func DeployEigenDAServiceManagerStub(auth *bind.TransactOpts, backend bind.ContractBackend, __avsDirectory common.Address, __paymentCoordinator common.Address, __registryCoordinator common.Address, __stakeRegistry common.Address, _pauserRegistry common.Address, _initialPausedStatus *big.Int, _initialOwner common.Address, _batchConfirmers []common.Address) (common.Address, *types.Transaction, *EigenDAServiceManagerStub, error) {

svcManagerAddr, tx, _, err := mocksgen.DeployEigenDAServiceManagerStub(&txOpts, l1Client, common.Address{}, common.Address{}, common.Address{}, common.Address{}, common.Address{}, big.NewInt(0), l1Info.GetAddress("deployer"), []common.Address{})
Require(t, err)
_, err = EnsureTxSucceeded(ctx, l1Client, tx)

// Require(t, err)
// _, err = EnsureTxSucceeded(ctx, l1Client, tx)

// DeploySequencerInbox(auth, client, maxDataSize, reader4844, dummyManager, dummyManager, isUsingFeeToken)
// func DeploySequencerInboxStub(auth *bind.TransactOpts, backend bind.ContractBackend, bridge_ common.Address, sequencer_ common.Address, maxTimeVariation_ ISequencerInboxMaxTimeVariation, maxDataSize_ *big.Int, reader4844_ common.Address, eigenDAServiceManager_ common.Address, eigenDARollupManager_ common.Address, isUsingFeeToken_ bool) (common.Address, *types.Transaction, *SequencerInboxStub, error) {

seqInboxAddr, tx, seqInbox, err := mocksgen.DeploySequencerInboxStub(
&txOpts,
l1Client,
Expand All @@ -219,6 +232,8 @@ func setupSequencerInboxStub(ctx context.Context, t *testing.T, l1Info *Blockcha
timeBounds,
big.NewInt(117964),
reader4844,
svcManagerAddr,
svcManagerAddr,
false,
)
Require(t, err)
Expand Down
Loading