Skip to content

Commit 8f4ecd1

Browse files
authored
Merge branch 'master' into feat/access-control
2 parents 39ba28d + 3633ba4 commit 8f4ecd1

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

.github/workflows/live-network-tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
4747
PAYLOAD=$(jq -n \
4848
--arg channel "#da-live-tests" \
49-
--arg text "${MENTION}Live Network Tests completed, status: ${STATUS_EMOJI} ${{ job.status }}" \
49+
--arg text "${MENTION}Live V2 Network Tests completed, status: ${STATUS_EMOJI} ${{ job.status }}" \
5050
--arg title "logs" \
5151
--arg title_link "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
5252
--arg color "$COLOR" \
@@ -101,7 +101,7 @@ jobs:
101101
102102
PAYLOAD=$(jq -n \
103103
--arg channel "#da-live-tests" \
104-
--arg text "${MENTION}Live Network Tests completed, status: ${STATUS_EMOJI} ${{ job.status }}" \
104+
--arg text "${MENTION}Live V1 Network Tests completed, status: ${STATUS_EMOJI} ${{ job.status }}" \
105105
--arg title "logs" \
106106
--arg title_link "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
107107
--arg color "$COLOR" \

api/clients/eigenda_client_e2e_live_test.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ func TestClientUsingTestnet(t *testing.T) {
4141

4242
t.Run("PutBlobWaitForConfirmationDepth0AndGetBlob", func(t *testing.T) {
4343
t.Parallel()
44+
confDepth := uint64(0)
4445

4546
client, err := NewEigenDAClient(testutils.GetLogger(), EigenDAClientConfig{
4647
RPC: testRPC,
@@ -52,7 +53,7 @@ func TestClientUsingTestnet(t *testing.T) {
5253
CustomQuorumIDs: []uint{},
5354
SignerPrivateKeyHex: testSignerPrivateKeyHex,
5455
WaitForFinalization: false,
55-
WaitForConfirmationDepth: 0,
56+
WaitForConfirmationDepth: confDepth,
5657
SvcManagerAddr: testSvcManagerAddr,
5758
EthRpcUrl: testEthRpcUrl,
5859
})
@@ -73,18 +74,18 @@ func TestClientUsingTestnet(t *testing.T) {
7374
confDepth := uint64(3)
7475

7576
client, err := NewEigenDAClient(testutils.GetLogger(), EigenDAClientConfig{
76-
RPC: "disperser-holesky.eigenda.xyz:443",
77+
RPC: testRPC,
7778
// Should need way less than 20 minutes, but we set it to 20 minutes to be safe
7879
// In worst case we had 10 min batching interval + some time for the tx to land onchain,
7980
// plus wait for 3 blocks of confirmation.
80-
StatusQueryTimeout: 20 * time.Minute,
81-
StatusQueryRetryInterval: 5 * time.Second,
81+
StatusQueryTimeout: testStatusQueryTimeout,
82+
StatusQueryRetryInterval: testStatusQueryRetryInterval,
8283
CustomQuorumIDs: []uint{},
83-
SignerPrivateKeyHex: "2d23e142a9e86a9175b9dfa213f20ea01f6c1731e09fa6edf895f70fe279cbb1",
84+
SignerPrivateKeyHex: testSignerPrivateKeyHex,
8485
WaitForFinalization: false,
8586
WaitForConfirmationDepth: confDepth,
86-
SvcManagerAddr: "0xD4A7E1Bd8015057293f0D0A557088c286942e84b",
87-
EthRpcUrl: "https://1rpc.io/holesky",
87+
SvcManagerAddr: testSvcManagerAddr,
88+
EthRpcUrl: testEthRpcUrl,
8889
})
8990
data := "hello world!"
9091
assert.NoError(t, err)

contracts/src/integrations/cert/router/EigenDACertVerifierRouter.sol

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,19 @@ contract EigenDACertVerifierRouter is IEigenDACertVerifierRouter, OwnableUpgrade
3535

3636
/// ADMIN ///
3737

38+
/// For a fully secure integration, the owner of this contract should be a timelocked contract.
3839
function initialize(address _initialOwner, address certVerifier) external initializer {
3940
_transferOwnership(_initialOwner);
4041
// Add a default cert verifier at block 0, which will be used for all blocks before the first ABN.
4142
_addCertVerifier(0, certVerifier);
4243
}
4344

45+
/// @notice Adds a cert verifier to the router.
46+
/// @param activationBlockNumber The block number at which the cert verifier will be activated.
47+
/// @param certVerifier The address of the cert verifier to be added.
48+
/// Note: for a fully secure integration, the owner of this contract should be a timelocked contract,
49+
/// such that new certs can only be activated after a certain period of time. When submitting this transaction,
50+
/// make sure that the activationBlockNumber is greater than the timelock period by some margin.
4451
function addCertVerifier(uint32 activationBlockNumber, address certVerifier) external onlyOwner {
4552
// We disallow adding cert verifiers at the current block number to avoid a race condition of
4653
// adding a cert verifier at the current block and verifying in the same block

0 commit comments

Comments
 (0)