Skip to content

fix(contracts): check address are not zero in initialization#1094

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.

Sign up for GitHub

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

Merged
JuArce merged 9 commits into from
Sep 30, 2024
Merged

fix(contracts): check address are not zero in initialization #1094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f9a8113
fix(contracts): check address are not zero in initialization
MarcosNicolau Sep 25, 2024
8071ca4
style: remove extra \n
uri-99 Sep 27, 2024
72e64dd
chore: remove extra comment
uri-99 Sep 27, 2024
79f272e
fix: make show aligned error codes
uri-99 Sep 27, 2024
ce274e4
chore: remove extra comment
uri-99 Sep 27, 2024
ea24501
fix(contracts): check address are not zero
MarcosNicolau Sep 27, 2024
d081866
test(contracts): fixed rewards coordinator initialization
MarcosNicolau Sep 30, 2024
869d179
Merge branch 'staging' into 1020-fixcontracts-batcherpaymentservice-c…
MarcosNicolau Sep 30, 2024
113e005
chore(contracts): aligned anvil state json
MarcosNicolau Sep 30, 2024
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -473,9 +473,9 @@ build_aligned_contracts:

show_aligned_error_codes:
@echo "\nAlignedLayerServiceManager errors:"
@cd contracts/src/core && forge inspect IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
@cd contracts && forge inspect src/core/IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
@echo "\nBatcherPaymentService errors:"
@cd contracts/src/core && forge inspect BatcherPaymentService.sol:BatcherPaymentService errors
@cd contracts && forge inspect src/core/BatcherPaymentService.sol:BatcherPaymentService errors

__BUILD__:
build_binaries:
Expand Down
2 changes: 1 addition & 1 deletion contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json
View file
Open in desktop

Large diffs are not rendered by default.

46 changes: 34 additions & 12 deletions contracts/src/core/AlignedLayerServiceManager.sol
View file
Open in desktop
Comment thread
MarcosNicolau marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,18 @@ contract AlignedLayerServiceManager is
__stakeRegistry
)
{
if (address(__avsDirectory) == address(0)) {
revert InvalidAddress("avsDirectory");
}
if (address(__rewardsCoordinator) == address(0)) {
revert InvalidAddress("rewardsCoordinator");
}
if (address(__registryCoordinator) == address(0)) {
revert InvalidAddress("registryCoordinator");
}
if (address(__stakeRegistry) == address(0)) {
revert InvalidAddress("stakeRegistry");
}
_disableInitializers();
}

Expand All@@ -45,6 +57,15 @@ contract AlignedLayerServiceManager is
address _rewardsInitiator,
address _alignedAggregator
) public initializer {
if (_initialOwner == address(0)) {
revert InvalidAddress("initialOwner");
}
if (_rewardsInitiator == address(0)) {
revert InvalidAddress("rewardsInitiator");
}
if (_alignedAggregator == address(0)) {
revert InvalidAddress("alignedAggregator");
}
__ServiceManagerBase_init(_initialOwner, _rewardsInitiator);
alignedAggregator = _alignedAggregator; //can't do setAggregator(aggregator) since caller is not the owner
}
Expand DownExpand Up@@ -129,7 +150,7 @@ contract AlignedLayerServiceManager is
if (currentBatch.responded) {
revert BatchAlreadyResponded(batchIdentifierHash);
}
currentBatch.responded = true;
currentBatch.responded = true;

// Check that batcher has enough funds to fund response
if (batchersBalances[senderAddress] < currentBatch.respondToTaskFeeLimit) {
Expand DownExpand Up@@ -181,7 +202,7 @@ contract AlignedLayerServiceManager is
senderAddress,
batchersBalances[senderAddress]
);

payable(alignedAggregator).transfer(txCost);
}

Expand DownExpand Up@@ -240,16 +261,17 @@ contract AlignedLayerServiceManager is
bytes memory merkleProof,
uint256 verificationDataBatchIndex
) external view returns (bool) {
return this.verifyBatchInclusion(
proofCommitment,
pubInputCommitment,
provingSystemAuxDataCommitment,
proofGeneratorAddr,
batchMerkleRoot,
merkleProof,
verificationDataBatchIndex,
address(0)
);
return
this.verifyBatchInclusion(
proofCommitment,
pubInputCommitment,
provingSystemAuxDataCommitment,
proofGeneratorAddr,
batchMerkleRoot,
merkleProof,
verificationDataBatchIndex,
address(0)
);
}

function setAggregator(address _alignedAggregator) public onlyOwner {
Expand Down
10 changes: 10 additions & 0 deletions contracts/src/core/BatcherPaymentService.sol
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ contract BatcherPaymentService is
uint256 required
); // 955c0664
error InvalidMerkleRoot(bytes32 expected, bytes32 actual); // 9f13b65c
error InvalidAddress(string param); // 161eb542

// CONSTRUCTOR & INITIALIZER
constructor() EIP712("Aligned", "1") {
Expand All@@ -70,6 +71,15 @@ contract BatcherPaymentService is
address _batcherWallet,
bytes32 _noncedVerificationDataTypeHash
) public initializer {
if (address(_alignedLayerServiceManager) == address(0)) {
revert InvalidAddress("alignedServiceManager");
}
if (_batcherPaymentServiceOwner == address(0)) {
revert InvalidAddress("batcherPaymentServiceOwner");
}
if (_batcherWallet == address(0)) {
revert InvalidAddress("batcherWallet");
}
__Ownable_init(); // default is msg.sender
__UUPSUpgradeable_init();
_transferOwnership(_batcherPaymentServiceOwner);
Expand Down
1 change: 1 addition & 0 deletions contracts/src/core/IAlignedLayerServiceManager.sol
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ interface IAlignedLayerServiceManager {
error SenderIsNotAggregator(address sender, address alignedAggregator); // 2cbe4195
error InvalidDepositAmount(uint256 amount); // 412ed242
error ExceededMaxRespondFee(uint256 respondToTaskFeeLimit, uint256 txCost); // 86fc507e
error InvalidAddress(string param); // 161eb542

function createNewTask(
bytes32 batchMerkleRoot,
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/AlignedLayerServiceManager.t.sol
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ contract AlignedLayerServiceManagerTest is BLSMockAVSDeployer {

alignedLayerServiceManager = new AlignedLayerServiceManager(
avsDirectory,
IRewardsCoordinator(address(rewardsCoordinator)),
IRewardsCoordinator(address(rewardsCoordinatorMock)),
IRegistryCoordinator(address(registryCoordinator)),
IStakeRegistry(address(stakeRegistry))
);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(contracts): check address are not zero in initialization by MarcosNicolau · Pull Request #1094 · yetanotherco/aligned_layer · GitHub
Skip to content
fix(contracts): check address are not zero in initialization#1094

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.

 Sign up for GitHub

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

 Merged

JuArce
merged 9 commits into

from

Sep 30, 2024
 Merged


fix(contracts): check address are not zero in initialization
#1094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
f9a8113

fix(contracts): check address are not zero in initialization


MarcosNicolau Sep 25, 2024
8071ca4

style: remove extra \n


uri-99 Sep 27, 2024
72e64dd

chore: remove extra comment


uri-99 Sep 27, 2024
79f272e

fix: make show aligned error codes


uri-99 Sep 27, 2024
ce274e4

chore: remove extra comment


uri-99 Sep 27, 2024
ea24501

fix(contracts): check address are not zero


MarcosNicolau Sep 27, 2024
d081866

test(contracts): fixed rewards coordinator initialization


MarcosNicolau Sep 30, 2024
869d179

Merge branch 'staging' into 1020-fixcontracts-batcherpaymentservice-c…


MarcosNicolau Sep 30, 2024
113e005

chore(contracts): aligned anvil state json


MarcosNicolau Sep 30, 2024

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


4 changes: 2 additions & 2 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -473,9 +473,9 @@ build_aligned_contracts:

show_aligned_error_codes:
	@echo "\nAlignedLayerServiceManager errors:"
	@cd contracts/src/core && forge inspect IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
	@cd contracts && forge inspect src/core/IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
	@echo "\nBatcherPaymentService errors:"
	@cd contracts/src/core && forge inspect BatcherPaymentService.sol:BatcherPaymentService errors
	@cd contracts && forge inspect src/core/BatcherPaymentService.sol:BatcherPaymentService errors

__BUILD__:
build_binaries:
Expand Down

2 changes: 1 addition & 1 deletion
contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

View file


Open in desktop


Large diffs are not rendered by default.


46 changes: 34 additions & 12 deletions
contracts/src/core/AlignedLayerServiceManager.sol

View file


Open in desktop

Comment thread
MarcosNicolau marked this conversation as resolved.

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,18 @@ contract AlignedLayerServiceManager is
 __stakeRegistry
 )
 {
 if (address(__avsDirectory) == address(0)) {
 revert InvalidAddress("avsDirectory");
 }
 if (address(__rewardsCoordinator) == address(0)) {
 revert InvalidAddress("rewardsCoordinator");
 }
 if (address(__registryCoordinator) == address(0)) {
 revert InvalidAddress("registryCoordinator");
 }
 if (address(__stakeRegistry) == address(0)) {
 revert InvalidAddress("stakeRegistry");
 }
 _disableInitializers();
 }

Expand All@@ -45,6 +57,15 @@ contract AlignedLayerServiceManager is
 address _rewardsInitiator,
 address _alignedAggregator
 ) public initializer {
 if (_initialOwner == address(0)) {
 revert InvalidAddress("initialOwner");
 }
 if (_rewardsInitiator == address(0)) {
 revert InvalidAddress("rewardsInitiator");
 }
 if (_alignedAggregator == address(0)) {
 revert InvalidAddress("alignedAggregator");
 }
 __ServiceManagerBase_init(_initialOwner, _rewardsInitiator);
 alignedAggregator = _alignedAggregator; //can't do setAggregator(aggregator) since caller is not the owner
 }
Expand DownExpand Up@@ -129,7 +150,7 @@ contract AlignedLayerServiceManager is
 if (currentBatch.responded) {
 revert BatchAlreadyResponded(batchIdentifierHash);
 }
 currentBatch.responded = true;
 currentBatch.responded = true;

 // Check that batcher has enough funds to fund response
 if (batchersBalances[senderAddress] < currentBatch.respondToTaskFeeLimit) {
Expand DownExpand Up@@ -181,7 +202,7 @@ contract AlignedLayerServiceManager is
 senderAddress,
 batchersBalances[senderAddress]
 );

 payable(alignedAggregator).transfer(txCost);
 }

Expand DownExpand Up@@ -240,16 +261,17 @@ contract AlignedLayerServiceManager is
 bytes memory merkleProof,
 uint256 verificationDataBatchIndex
 ) external view returns (bool) {
 return this.verifyBatchInclusion(
 proofCommitment,
 pubInputCommitment,
 provingSystemAuxDataCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex,
 address(0)
 );
 return
 this.verifyBatchInclusion(
 proofCommitment,
 pubInputCommitment,
 provingSystemAuxDataCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex,
 address(0)
 );
 }

 function setAggregator(address _alignedAggregator) public onlyOwner {
Expand Down

10 changes: 10 additions & 0 deletions
contracts/src/core/BatcherPaymentService.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ contract BatcherPaymentService is
 uint256 required
 ); // 955c0664
 error InvalidMerkleRoot(bytes32 expected, bytes32 actual); // 9f13b65c
 error InvalidAddress(string param); // 161eb542

 // CONSTRUCTOR & INITIALIZER
 constructor() EIP712("Aligned", "1") {
Expand All@@ -70,6 +71,15 @@ contract BatcherPaymentService is
 address _batcherWallet,
 bytes32 _noncedVerificationDataTypeHash
 ) public initializer {
 if (address(_alignedLayerServiceManager) == address(0)) {
 revert InvalidAddress("alignedServiceManager");
 }
 if (_batcherPaymentServiceOwner == address(0)) {
 revert InvalidAddress("batcherPaymentServiceOwner");
 }
 if (_batcherWallet == address(0)) {
 revert InvalidAddress("batcherWallet");
 }
 __Ownable_init(); // default is msg.sender
 __UUPSUpgradeable_init();
 _transferOwnership(_batcherPaymentServiceOwner);
Expand Down

1 change: 1 addition & 0 deletions
contracts/src/core/IAlignedLayerServiceManager.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ interface IAlignedLayerServiceManager {
 error SenderIsNotAggregator(address sender, address alignedAggregator); // 2cbe4195
 error InvalidDepositAmount(uint256 amount); // 412ed242
 error ExceededMaxRespondFee(uint256 respondToTaskFeeLimit, uint256 txCost); // 86fc507e
 error InvalidAddress(string param); // 161eb542

 function createNewTask(
 bytes32 batchMerkleRoot,
Expand Down

2 changes: 1 addition & 1 deletion
contracts/test/AlignedLayerServiceManager.t.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ contract AlignedLayerServiceManagerTest is BLSMockAVSDeployer {

 alignedLayerServiceManager = new AlignedLayerServiceManager(
 avsDirectory,
 IRewardsCoordinator(address(rewardsCoordinator)),
 IRewardsCoordinator(address(rewardsCoordinatorMock)),
 IRegistryCoordinator(address(registryCoordinator)),
 IStakeRegistry(address(stakeRegistry))
 );
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(contracts): check address are not zero in initialization by MarcosNicolau · Pull Request #1094 · yetanotherco/aligned_layer · GitHub
Skip to content
fix(contracts): check address are not zero in initialization#1094

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.

 Sign up for GitHub

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

 Merged

JuArce
merged 9 commits into

from

Sep 30, 2024
 Merged


fix(contracts): check address are not zero in initialization
#1094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
f9a8113

fix(contracts): check address are not zero in initialization


MarcosNicolau Sep 25, 2024
8071ca4

style: remove extra \n


uri-99 Sep 27, 2024
72e64dd

chore: remove extra comment


uri-99 Sep 27, 2024
79f272e

fix: make show aligned error codes


uri-99 Sep 27, 2024
ce274e4

chore: remove extra comment


uri-99 Sep 27, 2024
ea24501

fix(contracts): check address are not zero


MarcosNicolau Sep 27, 2024
d081866

test(contracts): fixed rewards coordinator initialization


MarcosNicolau Sep 30, 2024
869d179

Merge branch 'staging' into 1020-fixcontracts-batcherpaymentservice-c…


MarcosNicolau Sep 30, 2024
113e005

chore(contracts): aligned anvil state json


MarcosNicolau Sep 30, 2024

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


4 changes: 2 additions & 2 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -473,9 +473,9 @@ build_aligned_contracts:

show_aligned_error_codes:
	@echo "\nAlignedLayerServiceManager errors:"
	@cd contracts/src/core && forge inspect IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
	@cd contracts && forge inspect src/core/IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
	@echo "\nBatcherPaymentService errors:"
	@cd contracts/src/core && forge inspect BatcherPaymentService.sol:BatcherPaymentService errors
	@cd contracts && forge inspect src/core/BatcherPaymentService.sol:BatcherPaymentService errors

__BUILD__:
build_binaries:
Expand Down

2 changes: 1 addition & 1 deletion
contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

View file


Open in desktop


Large diffs are not rendered by default.


46 changes: 34 additions & 12 deletions
contracts/src/core/AlignedLayerServiceManager.sol

View file


Open in desktop

Comment thread
MarcosNicolau marked this conversation as resolved.

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,18 @@ contract AlignedLayerServiceManager is
 __stakeRegistry
 )
 {
 if (address(__avsDirectory) == address(0)) {
 revert InvalidAddress("avsDirectory");
 }
 if (address(__rewardsCoordinator) == address(0)) {
 revert InvalidAddress("rewardsCoordinator");
 }
 if (address(__registryCoordinator) == address(0)) {
 revert InvalidAddress("registryCoordinator");
 }
 if (address(__stakeRegistry) == address(0)) {
 revert InvalidAddress("stakeRegistry");
 }
 _disableInitializers();
 }

Expand All@@ -45,6 +57,15 @@ contract AlignedLayerServiceManager is
 address _rewardsInitiator,
 address _alignedAggregator
 ) public initializer {
 if (_initialOwner == address(0)) {
 revert InvalidAddress("initialOwner");
 }
 if (_rewardsInitiator == address(0)) {
 revert InvalidAddress("rewardsInitiator");
 }
 if (_alignedAggregator == address(0)) {
 revert InvalidAddress("alignedAggregator");
 }
 __ServiceManagerBase_init(_initialOwner, _rewardsInitiator);
 alignedAggregator = _alignedAggregator; //can't do setAggregator(aggregator) since caller is not the owner
 }
Expand DownExpand Up@@ -129,7 +150,7 @@ contract AlignedLayerServiceManager is
 if (currentBatch.responded) {
 revert BatchAlreadyResponded(batchIdentifierHash);
 }
 currentBatch.responded = true;
 currentBatch.responded = true;

 // Check that batcher has enough funds to fund response
 if (batchersBalances[senderAddress] < currentBatch.respondToTaskFeeLimit) {
Expand DownExpand Up@@ -181,7 +202,7 @@ contract AlignedLayerServiceManager is
 senderAddress,
 batchersBalances[senderAddress]
 );

 payable(alignedAggregator).transfer(txCost);
 }

Expand DownExpand Up@@ -240,16 +261,17 @@ contract AlignedLayerServiceManager is
 bytes memory merkleProof,
 uint256 verificationDataBatchIndex
 ) external view returns (bool) {
 return this.verifyBatchInclusion(
 proofCommitment,
 pubInputCommitment,
 provingSystemAuxDataCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex,
 address(0)
 );
 return
 this.verifyBatchInclusion(
 proofCommitment,
 pubInputCommitment,
 provingSystemAuxDataCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex,
 address(0)
 );
 }

 function setAggregator(address _alignedAggregator) public onlyOwner {
Expand Down

10 changes: 10 additions & 0 deletions
contracts/src/core/BatcherPaymentService.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ contract BatcherPaymentService is
 uint256 required
 ); // 955c0664
 error InvalidMerkleRoot(bytes32 expected, bytes32 actual); // 9f13b65c
 error InvalidAddress(string param); // 161eb542

 // CONSTRUCTOR & INITIALIZER
 constructor() EIP712("Aligned", "1") {
Expand All@@ -70,6 +71,15 @@ contract BatcherPaymentService is
 address _batcherWallet,
 bytes32 _noncedVerificationDataTypeHash
 ) public initializer {
 if (address(_alignedLayerServiceManager) == address(0)) {
 revert InvalidAddress("alignedServiceManager");
 }
 if (_batcherPaymentServiceOwner == address(0)) {
 revert InvalidAddress("batcherPaymentServiceOwner");
 }
 if (_batcherWallet == address(0)) {
 revert InvalidAddress("batcherWallet");
 }
 __Ownable_init(); // default is msg.sender
 __UUPSUpgradeable_init();
 _transferOwnership(_batcherPaymentServiceOwner);
Expand Down

1 change: 1 addition & 0 deletions
contracts/src/core/IAlignedLayerServiceManager.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ interface IAlignedLayerServiceManager {
 error SenderIsNotAggregator(address sender, address alignedAggregator); // 2cbe4195
 error InvalidDepositAmount(uint256 amount); // 412ed242
 error ExceededMaxRespondFee(uint256 respondToTaskFeeLimit, uint256 txCost); // 86fc507e
 error InvalidAddress(string param); // 161eb542

 function createNewTask(
 bytes32 batchMerkleRoot,
Expand Down

2 changes: 1 addition & 1 deletion
contracts/test/AlignedLayerServiceManager.t.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ contract AlignedLayerServiceManagerTest is BLSMockAVSDeployer {

 alignedLayerServiceManager = new AlignedLayerServiceManager(
 avsDirectory,
 IRewardsCoordinator(address(rewardsCoordinator)),
 IRewardsCoordinator(address(rewardsCoordinatorMock)),
 IRegistryCoordinator(address(registryCoordinator)),
 IStakeRegistry(address(stakeRegistry))
 );
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(contracts): check address are not zero in initialization by MarcosNicolau · Pull Request #1094 · yetanotherco/aligned_layer · GitHub
Skip to content
fix(contracts): check address are not zero in initialization#1094

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.

 Sign up for GitHub

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

 Merged

JuArce
merged 9 commits into

from

Sep 30, 2024
 Merged


fix(contracts): check address are not zero in initialization
#1094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
f9a8113

fix(contracts): check address are not zero in initialization


MarcosNicolau Sep 25, 2024
8071ca4

style: remove extra \n


uri-99 Sep 27, 2024
72e64dd

chore: remove extra comment


uri-99 Sep 27, 2024
79f272e

fix: make show aligned error codes


uri-99 Sep 27, 2024
ce274e4

chore: remove extra comment


uri-99 Sep 27, 2024
ea24501

fix(contracts): check address are not zero


MarcosNicolau Sep 27, 2024
d081866

test(contracts): fixed rewards coordinator initialization


MarcosNicolau Sep 30, 2024
869d179

Merge branch 'staging' into 1020-fixcontracts-batcherpaymentservice-c…


MarcosNicolau Sep 30, 2024
113e005

chore(contracts): aligned anvil state json


MarcosNicolau Sep 30, 2024

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


4 changes: 2 additions & 2 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -473,9 +473,9 @@ build_aligned_contracts:

show_aligned_error_codes:
	@echo "\nAlignedLayerServiceManager errors:"
	@cd contracts/src/core && forge inspect IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
	@cd contracts && forge inspect src/core/IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
	@echo "\nBatcherPaymentService errors:"
	@cd contracts/src/core && forge inspect BatcherPaymentService.sol:BatcherPaymentService errors
	@cd contracts && forge inspect src/core/BatcherPaymentService.sol:BatcherPaymentService errors

__BUILD__:
build_binaries:
Expand Down

2 changes: 1 addition & 1 deletion
contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

View file


Open in desktop


Large diffs are not rendered by default.


46 changes: 34 additions & 12 deletions
contracts/src/core/AlignedLayerServiceManager.sol

View file


Open in desktop

Comment thread
MarcosNicolau marked this conversation as resolved.

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,18 @@ contract AlignedLayerServiceManager is
 __stakeRegistry
 )
 {
 if (address(__avsDirectory) == address(0)) {
 revert InvalidAddress("avsDirectory");
 }
 if (address(__rewardsCoordinator) == address(0)) {
 revert InvalidAddress("rewardsCoordinator");
 }
 if (address(__registryCoordinator) == address(0)) {
 revert InvalidAddress("registryCoordinator");
 }
 if (address(__stakeRegistry) == address(0)) {
 revert InvalidAddress("stakeRegistry");
 }
 _disableInitializers();
 }

Expand All@@ -45,6 +57,15 @@ contract AlignedLayerServiceManager is
 address _rewardsInitiator,
 address _alignedAggregator
 ) public initializer {
 if (_initialOwner == address(0)) {
 revert InvalidAddress("initialOwner");
 }
 if (_rewardsInitiator == address(0)) {
 revert InvalidAddress("rewardsInitiator");
 }
 if (_alignedAggregator == address(0)) {
 revert InvalidAddress("alignedAggregator");
 }
 __ServiceManagerBase_init(_initialOwner, _rewardsInitiator);
 alignedAggregator = _alignedAggregator; //can't do setAggregator(aggregator) since caller is not the owner
 }
Expand DownExpand Up@@ -129,7 +150,7 @@ contract AlignedLayerServiceManager is
 if (currentBatch.responded) {
 revert BatchAlreadyResponded(batchIdentifierHash);
 }
 currentBatch.responded = true;
 currentBatch.responded = true;

 // Check that batcher has enough funds to fund response
 if (batchersBalances[senderAddress] < currentBatch.respondToTaskFeeLimit) {
Expand DownExpand Up@@ -181,7 +202,7 @@ contract AlignedLayerServiceManager is
 senderAddress,
 batchersBalances[senderAddress]
 );

 payable(alignedAggregator).transfer(txCost);
 }

Expand DownExpand Up@@ -240,16 +261,17 @@ contract AlignedLayerServiceManager is
 bytes memory merkleProof,
 uint256 verificationDataBatchIndex
 ) external view returns (bool) {
 return this.verifyBatchInclusion(
 proofCommitment,
 pubInputCommitment,
 provingSystemAuxDataCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex,
 address(0)
 );
 return
 this.verifyBatchInclusion(
 proofCommitment,
 pubInputCommitment,
 provingSystemAuxDataCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex,
 address(0)
 );
 }

 function setAggregator(address _alignedAggregator) public onlyOwner {
Expand Down

10 changes: 10 additions & 0 deletions
contracts/src/core/BatcherPaymentService.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ contract BatcherPaymentService is
 uint256 required
 ); // 955c0664
 error InvalidMerkleRoot(bytes32 expected, bytes32 actual); // 9f13b65c
 error InvalidAddress(string param); // 161eb542

 // CONSTRUCTOR & INITIALIZER
 constructor() EIP712("Aligned", "1") {
Expand All@@ -70,6 +71,15 @@ contract BatcherPaymentService is
 address _batcherWallet,
 bytes32 _noncedVerificationDataTypeHash
 ) public initializer {
 if (address(_alignedLayerServiceManager) == address(0)) {
 revert InvalidAddress("alignedServiceManager");
 }
 if (_batcherPaymentServiceOwner == address(0)) {
 revert InvalidAddress("batcherPaymentServiceOwner");
 }
 if (_batcherWallet == address(0)) {
 revert InvalidAddress("batcherWallet");
 }
 __Ownable_init(); // default is msg.sender
 __UUPSUpgradeable_init();
 _transferOwnership(_batcherPaymentServiceOwner);
Expand Down

1 change: 1 addition & 0 deletions
contracts/src/core/IAlignedLayerServiceManager.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ interface IAlignedLayerServiceManager {
 error SenderIsNotAggregator(address sender, address alignedAggregator); // 2cbe4195
 error InvalidDepositAmount(uint256 amount); // 412ed242
 error ExceededMaxRespondFee(uint256 respondToTaskFeeLimit, uint256 txCost); // 86fc507e
 error InvalidAddress(string param); // 161eb542

 function createNewTask(
 bytes32 batchMerkleRoot,
Expand Down

2 changes: 1 addition & 1 deletion
contracts/test/AlignedLayerServiceManager.t.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ contract AlignedLayerServiceManagerTest is BLSMockAVSDeployer {

 alignedLayerServiceManager = new AlignedLayerServiceManager(
 avsDirectory,
 IRewardsCoordinator(address(rewardsCoordinator)),
 IRewardsCoordinator(address(rewardsCoordinatorMock)),
 IRegistryCoordinator(address(registryCoordinator)),
 IStakeRegistry(address(stakeRegistry))
 );
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix(contracts): check address are not zero in initialization by MarcosNicolau · Pull Request #1094 · yetanotherco/aligned_layer · GitHub
Skip to content
fix(contracts): check address are not zero in initialization#1094

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.

 Sign up for GitHub

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

 Merged

JuArce
merged 9 commits into

from

Sep 30, 2024
 Merged


fix(contracts): check address are not zero in initialization
#1094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
f9a8113

fix(contracts): check address are not zero in initialization


MarcosNicolau Sep 25, 2024
8071ca4

style: remove extra \n


uri-99 Sep 27, 2024
72e64dd

chore: remove extra comment


uri-99 Sep 27, 2024
79f272e

fix: make show aligned error codes


uri-99 Sep 27, 2024
ce274e4

chore: remove extra comment


uri-99 Sep 27, 2024
ea24501

fix(contracts): check address are not zero


MarcosNicolau Sep 27, 2024
d081866

test(contracts): fixed rewards coordinator initialization


MarcosNicolau Sep 30, 2024
869d179

Merge branch 'staging' into 1020-fixcontracts-batcherpaymentservice-c…


MarcosNicolau Sep 30, 2024
113e005

chore(contracts): aligned anvil state json


MarcosNicolau Sep 30, 2024

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


4 changes: 2 additions & 2 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -473,9 +473,9 @@ build_aligned_contracts:

show_aligned_error_codes:
	@echo "\nAlignedLayerServiceManager errors:"
	@cd contracts/src/core && forge inspect IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
	@cd contracts && forge inspect src/core/IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
	@echo "\nBatcherPaymentService errors:"
	@cd contracts/src/core && forge inspect BatcherPaymentService.sol:BatcherPaymentService errors
	@cd contracts && forge inspect src/core/BatcherPaymentService.sol:BatcherPaymentService errors

__BUILD__:
build_binaries:
Expand Down

2 changes: 1 addition & 1 deletion
contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

View file


Open in desktop


Large diffs are not rendered by default.


46 changes: 34 additions & 12 deletions
contracts/src/core/AlignedLayerServiceManager.sol

View file


Open in desktop

Comment thread
MarcosNicolau marked this conversation as resolved.

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,18 @@ contract AlignedLayerServiceManager is
 __stakeRegistry
 )
 {
 if (address(__avsDirectory) == address(0)) {
 revert InvalidAddress("avsDirectory");
 }
 if (address(__rewardsCoordinator) == address(0)) {
 revert InvalidAddress("rewardsCoordinator");
 }
 if (address(__registryCoordinator) == address(0)) {
 revert InvalidAddress("registryCoordinator");
 }
 if (address(__stakeRegistry) == address(0)) {
 revert InvalidAddress("stakeRegistry");
 }
 _disableInitializers();
 }

Expand All@@ -45,6 +57,15 @@ contract AlignedLayerServiceManager is
 address _rewardsInitiator,
 address _alignedAggregator
 ) public initializer {
 if (_initialOwner == address(0)) {
 revert InvalidAddress("initialOwner");
 }
 if (_rewardsInitiator == address(0)) {
 revert InvalidAddress("rewardsInitiator");
 }
 if (_alignedAggregator == address(0)) {
 revert InvalidAddress("alignedAggregator");
 }
 __ServiceManagerBase_init(_initialOwner, _rewardsInitiator);
 alignedAggregator = _alignedAggregator; //can't do setAggregator(aggregator) since caller is not the owner
 }
Expand DownExpand Up@@ -129,7 +150,7 @@ contract AlignedLayerServiceManager is
 if (currentBatch.responded) {
 revert BatchAlreadyResponded(batchIdentifierHash);
 }
 currentBatch.responded = true;
 currentBatch.responded = true;

 // Check that batcher has enough funds to fund response
 if (batchersBalances[senderAddress] < currentBatch.respondToTaskFeeLimit) {
Expand DownExpand Up@@ -181,7 +202,7 @@ contract AlignedLayerServiceManager is
 senderAddress,
 batchersBalances[senderAddress]
 );

 payable(alignedAggregator).transfer(txCost);
 }

Expand DownExpand Up@@ -240,16 +261,17 @@ contract AlignedLayerServiceManager is
 bytes memory merkleProof,
 uint256 verificationDataBatchIndex
 ) external view returns (bool) {
 return this.verifyBatchInclusion(
 proofCommitment,
 pubInputCommitment,
 provingSystemAuxDataCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex,
 address(0)
 );
 return
 this.verifyBatchInclusion(
 proofCommitment,
 pubInputCommitment,
 provingSystemAuxDataCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex,
 address(0)
 );
 }

 function setAggregator(address _alignedAggregator) public onlyOwner {
Expand Down

10 changes: 10 additions & 0 deletions
contracts/src/core/BatcherPaymentService.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ contract BatcherPaymentService is
 uint256 required
 ); // 955c0664
 error InvalidMerkleRoot(bytes32 expected, bytes32 actual); // 9f13b65c
 error InvalidAddress(string param); // 161eb542

 // CONSTRUCTOR & INITIALIZER
 constructor() EIP712("Aligned", "1") {
Expand All@@ -70,6 +71,15 @@ contract BatcherPaymentService is
 address _batcherWallet,
 bytes32 _noncedVerificationDataTypeHash
 ) public initializer {
 if (address(_alignedLayerServiceManager) == address(0)) {
 revert InvalidAddress("alignedServiceManager");
 }
 if (_batcherPaymentServiceOwner == address(0)) {
 revert InvalidAddress("batcherPaymentServiceOwner");
 }
 if (_batcherWallet == address(0)) {
 revert InvalidAddress("batcherWallet");
 }
 __Ownable_init(); // default is msg.sender
 __UUPSUpgradeable_init();
 _transferOwnership(_batcherPaymentServiceOwner);
Expand Down

1 change: 1 addition & 0 deletions
contracts/src/core/IAlignedLayerServiceManager.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ interface IAlignedLayerServiceManager {
 error SenderIsNotAggregator(address sender, address alignedAggregator); // 2cbe4195
 error InvalidDepositAmount(uint256 amount); // 412ed242
 error ExceededMaxRespondFee(uint256 respondToTaskFeeLimit, uint256 txCost); // 86fc507e
 error InvalidAddress(string param); // 161eb542

 function createNewTask(
 bytes32 batchMerkleRoot,
Expand Down

2 changes: 1 addition & 1 deletion
contracts/test/AlignedLayerServiceManager.t.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ contract AlignedLayerServiceManagerTest is BLSMockAVSDeployer {

 alignedLayerServiceManager = new AlignedLayerServiceManager(
 avsDirectory,
 IRewardsCoordinator(address(rewardsCoordinator)),
 IRewardsCoordinator(address(rewardsCoordinatorMock)),
 IRegistryCoordinator(address(registryCoordinator)),
 IStakeRegistry(address(stakeRegistry))
 );
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(contracts): check address are not zero in initialization by MarcosNicolau · Pull Request #1094 · yetanotherco/aligned_layer · GitHub
Skip to content
fix(contracts): check address are not zero in initialization#1094

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.

 Sign up for GitHub

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

 Merged

JuArce
merged 9 commits into

from

Sep 30, 2024
 Merged


fix(contracts): check address are not zero in initialization
#1094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
f9a8113

fix(contracts): check address are not zero in initialization


MarcosNicolau Sep 25, 2024
8071ca4

style: remove extra \n


uri-99 Sep 27, 2024
72e64dd

chore: remove extra comment


uri-99 Sep 27, 2024
79f272e

fix: make show aligned error codes


uri-99 Sep 27, 2024
ce274e4

chore: remove extra comment


uri-99 Sep 27, 2024
ea24501

fix(contracts): check address are not zero


MarcosNicolau Sep 27, 2024
d081866

test(contracts): fixed rewards coordinator initialization


MarcosNicolau Sep 30, 2024
869d179

Merge branch 'staging' into 1020-fixcontracts-batcherpaymentservice-c…


MarcosNicolau Sep 30, 2024
113e005

chore(contracts): aligned anvil state json


MarcosNicolau Sep 30, 2024

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


4 changes: 2 additions & 2 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -473,9 +473,9 @@ build_aligned_contracts:

show_aligned_error_codes:
	@echo "\nAlignedLayerServiceManager errors:"
	@cd contracts/src/core && forge inspect IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
	@cd contracts && forge inspect src/core/IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
	@echo "\nBatcherPaymentService errors:"
	@cd contracts/src/core && forge inspect BatcherPaymentService.sol:BatcherPaymentService errors
	@cd contracts && forge inspect src/core/BatcherPaymentService.sol:BatcherPaymentService errors

__BUILD__:
build_binaries:
Expand Down

2 changes: 1 addition & 1 deletion
contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

View file


Open in desktop


Large diffs are not rendered by default.


46 changes: 34 additions & 12 deletions
contracts/src/core/AlignedLayerServiceManager.sol

View file


Open in desktop

Comment thread
MarcosNicolau marked this conversation as resolved.

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,18 @@ contract AlignedLayerServiceManager is
 __stakeRegistry
 )
 {
 if (address(__avsDirectory) == address(0)) {
 revert InvalidAddress("avsDirectory");
 }
 if (address(__rewardsCoordinator) == address(0)) {
 revert InvalidAddress("rewardsCoordinator");
 }
 if (address(__registryCoordinator) == address(0)) {
 revert InvalidAddress("registryCoordinator");
 }
 if (address(__stakeRegistry) == address(0)) {
 revert InvalidAddress("stakeRegistry");
 }
 _disableInitializers();
 }

Expand All@@ -45,6 +57,15 @@ contract AlignedLayerServiceManager is
 address _rewardsInitiator,
 address _alignedAggregator
 ) public initializer {
 if (_initialOwner == address(0)) {
 revert InvalidAddress("initialOwner");
 }
 if (_rewardsInitiator == address(0)) {
 revert InvalidAddress("rewardsInitiator");
 }
 if (_alignedAggregator == address(0)) {
 revert InvalidAddress("alignedAggregator");
 }
 __ServiceManagerBase_init(_initialOwner, _rewardsInitiator);
 alignedAggregator = _alignedAggregator; //can't do setAggregator(aggregator) since caller is not the owner
 }
Expand DownExpand Up@@ -129,7 +150,7 @@ contract AlignedLayerServiceManager is
 if (currentBatch.responded) {
 revert BatchAlreadyResponded(batchIdentifierHash);
 }
 currentBatch.responded = true;
 currentBatch.responded = true;

 // Check that batcher has enough funds to fund response
 if (batchersBalances[senderAddress] < currentBatch.respondToTaskFeeLimit) {
Expand DownExpand Up@@ -181,7 +202,7 @@ contract AlignedLayerServiceManager is
 senderAddress,
 batchersBalances[senderAddress]
 );

 payable(alignedAggregator).transfer(txCost);
 }

Expand DownExpand Up@@ -240,16 +261,17 @@ contract AlignedLayerServiceManager is
 bytes memory merkleProof,
 uint256 verificationDataBatchIndex
 ) external view returns (bool) {
 return this.verifyBatchInclusion(
 proofCommitment,
 pubInputCommitment,
 provingSystemAuxDataCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex,
 address(0)
 );
 return
 this.verifyBatchInclusion(
 proofCommitment,
 pubInputCommitment,
 provingSystemAuxDataCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex,
 address(0)
 );
 }

 function setAggregator(address _alignedAggregator) public onlyOwner {
Expand Down

10 changes: 10 additions & 0 deletions
contracts/src/core/BatcherPaymentService.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ contract BatcherPaymentService is
 uint256 required
 ); // 955c0664
 error InvalidMerkleRoot(bytes32 expected, bytes32 actual); // 9f13b65c
 error InvalidAddress(string param); // 161eb542

 // CONSTRUCTOR & INITIALIZER
 constructor() EIP712("Aligned", "1") {
Expand All@@ -70,6 +71,15 @@ contract BatcherPaymentService is
 address _batcherWallet,
 bytes32 _noncedVerificationDataTypeHash
 ) public initializer {
 if (address(_alignedLayerServiceManager) == address(0)) {
 revert InvalidAddress("alignedServiceManager");
 }
 if (_batcherPaymentServiceOwner == address(0)) {
 revert InvalidAddress("batcherPaymentServiceOwner");
 }
 if (_batcherWallet == address(0)) {
 revert InvalidAddress("batcherWallet");
 }
 __Ownable_init(); // default is msg.sender
 __UUPSUpgradeable_init();
 _transferOwnership(_batcherPaymentServiceOwner);
Expand Down

1 change: 1 addition & 0 deletions
contracts/src/core/IAlignedLayerServiceManager.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ interface IAlignedLayerServiceManager {
 error SenderIsNotAggregator(address sender, address alignedAggregator); // 2cbe4195
 error InvalidDepositAmount(uint256 amount); // 412ed242
 error ExceededMaxRespondFee(uint256 respondToTaskFeeLimit, uint256 txCost); // 86fc507e
 error InvalidAddress(string param); // 161eb542

 function createNewTask(
 bytes32 batchMerkleRoot,
Expand Down

2 changes: 1 addition & 1 deletion
contracts/test/AlignedLayerServiceManager.t.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ contract AlignedLayerServiceManagerTest is BLSMockAVSDeployer {

 alignedLayerServiceManager = new AlignedLayerServiceManager(
 avsDirectory,
 IRewardsCoordinator(address(rewardsCoordinator)),
 IRewardsCoordinator(address(rewardsCoordinatorMock)),
 IRegistryCoordinator(address(registryCoordinator)),
 IStakeRegistry(address(stakeRegistry))
 );
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(contracts): check address are not zero in initialization by MarcosNicolau · Pull Request #1094 · yetanotherco/aligned_layer · GitHub
Skip to content
fix(contracts): check address are not zero in initialization#1094

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.

 Sign up for GitHub

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

 Merged

JuArce
merged 9 commits into

from

Sep 30, 2024
 Merged


fix(contracts): check address are not zero in initialization
#1094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
f9a8113

fix(contracts): check address are not zero in initialization


MarcosNicolau Sep 25, 2024
8071ca4

style: remove extra \n


uri-99 Sep 27, 2024
72e64dd

chore: remove extra comment


uri-99 Sep 27, 2024
79f272e

fix: make show aligned error codes


uri-99 Sep 27, 2024
ce274e4

chore: remove extra comment


uri-99 Sep 27, 2024
ea24501

fix(contracts): check address are not zero


MarcosNicolau Sep 27, 2024
d081866

test(contracts): fixed rewards coordinator initialization


MarcosNicolau Sep 30, 2024
869d179

Merge branch 'staging' into 1020-fixcontracts-batcherpaymentservice-c…


MarcosNicolau Sep 30, 2024
113e005

chore(contracts): aligned anvil state json


MarcosNicolau Sep 30, 2024

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


4 changes: 2 additions & 2 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -473,9 +473,9 @@ build_aligned_contracts:

show_aligned_error_codes:
	@echo "\nAlignedLayerServiceManager errors:"
	@cd contracts/src/core && forge inspect IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
	@cd contracts && forge inspect src/core/IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
	@echo "\nBatcherPaymentService errors:"
	@cd contracts/src/core && forge inspect BatcherPaymentService.sol:BatcherPaymentService errors
	@cd contracts && forge inspect src/core/BatcherPaymentService.sol:BatcherPaymentService errors

__BUILD__:
build_binaries:
Expand Down

2 changes: 1 addition & 1 deletion
contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

View file


Open in desktop


Large diffs are not rendered by default.


46 changes: 34 additions & 12 deletions
contracts/src/core/AlignedLayerServiceManager.sol

View file


Open in desktop

Comment thread
MarcosNicolau marked this conversation as resolved.

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,18 @@ contract AlignedLayerServiceManager is
 __stakeRegistry
 )
 {
 if (address(__avsDirectory) == address(0)) {
 revert InvalidAddress("avsDirectory");
 }
 if (address(__rewardsCoordinator) == address(0)) {
 revert InvalidAddress("rewardsCoordinator");
 }
 if (address(__registryCoordinator) == address(0)) {
 revert InvalidAddress("registryCoordinator");
 }
 if (address(__stakeRegistry) == address(0)) {
 revert InvalidAddress("stakeRegistry");
 }
 _disableInitializers();
 }

Expand All@@ -45,6 +57,15 @@ contract AlignedLayerServiceManager is
 address _rewardsInitiator,
 address _alignedAggregator
 ) public initializer {
 if (_initialOwner == address(0)) {
 revert InvalidAddress("initialOwner");
 }
 if (_rewardsInitiator == address(0)) {
 revert InvalidAddress("rewardsInitiator");
 }
 if (_alignedAggregator == address(0)) {
 revert InvalidAddress("alignedAggregator");
 }
 __ServiceManagerBase_init(_initialOwner, _rewardsInitiator);
 alignedAggregator = _alignedAggregator; //can't do setAggregator(aggregator) since caller is not the owner
 }
Expand DownExpand Up@@ -129,7 +150,7 @@ contract AlignedLayerServiceManager is
 if (currentBatch.responded) {
 revert BatchAlreadyResponded(batchIdentifierHash);
 }
 currentBatch.responded = true;
 currentBatch.responded = true;

 // Check that batcher has enough funds to fund response
 if (batchersBalances[senderAddress] < currentBatch.respondToTaskFeeLimit) {
Expand DownExpand Up@@ -181,7 +202,7 @@ contract AlignedLayerServiceManager is
 senderAddress,
 batchersBalances[senderAddress]
 );

 payable(alignedAggregator).transfer(txCost);
 }

Expand DownExpand Up@@ -240,16 +261,17 @@ contract AlignedLayerServiceManager is
 bytes memory merkleProof,
 uint256 verificationDataBatchIndex
 ) external view returns (bool) {
 return this.verifyBatchInclusion(
 proofCommitment,
 pubInputCommitment,
 provingSystemAuxDataCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex,
 address(0)
 );
 return
 this.verifyBatchInclusion(
 proofCommitment,
 pubInputCommitment,
 provingSystemAuxDataCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex,
 address(0)
 );
 }

 function setAggregator(address _alignedAggregator) public onlyOwner {
Expand Down

10 changes: 10 additions & 0 deletions
contracts/src/core/BatcherPaymentService.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ contract BatcherPaymentService is
 uint256 required
 ); // 955c0664
 error InvalidMerkleRoot(bytes32 expected, bytes32 actual); // 9f13b65c
 error InvalidAddress(string param); // 161eb542

 // CONSTRUCTOR & INITIALIZER
 constructor() EIP712("Aligned", "1") {
Expand All@@ -70,6 +71,15 @@ contract BatcherPaymentService is
 address _batcherWallet,
 bytes32 _noncedVerificationDataTypeHash
 ) public initializer {
 if (address(_alignedLayerServiceManager) == address(0)) {
 revert InvalidAddress("alignedServiceManager");
 }
 if (_batcherPaymentServiceOwner == address(0)) {
 revert InvalidAddress("batcherPaymentServiceOwner");
 }
 if (_batcherWallet == address(0)) {
 revert InvalidAddress("batcherWallet");
 }
 __Ownable_init(); // default is msg.sender
 __UUPSUpgradeable_init();
 _transferOwnership(_batcherPaymentServiceOwner);
Expand Down

1 change: 1 addition & 0 deletions
contracts/src/core/IAlignedLayerServiceManager.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ interface IAlignedLayerServiceManager {
 error SenderIsNotAggregator(address sender, address alignedAggregator); // 2cbe4195
 error InvalidDepositAmount(uint256 amount); // 412ed242
 error ExceededMaxRespondFee(uint256 respondToTaskFeeLimit, uint256 txCost); // 86fc507e
 error InvalidAddress(string param); // 161eb542

 function createNewTask(
 bytes32 batchMerkleRoot,
Expand Down

2 changes: 1 addition & 1 deletion
contracts/test/AlignedLayerServiceManager.t.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ contract AlignedLayerServiceManagerTest is BLSMockAVSDeployer {

 alignedLayerServiceManager = new AlignedLayerServiceManager(
 avsDirectory,
 IRewardsCoordinator(address(rewardsCoordinator)),
 IRewardsCoordinator(address(rewardsCoordinatorMock)),
 IRegistryCoordinator(address(registryCoordinator)),
 IStakeRegistry(address(stakeRegistry))
 );
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix(contracts): check address are not zero in initialization by MarcosNicolau · Pull Request #1094 · yetanotherco/aligned_layer · GitHub
Skip to content
fix(contracts): check address are not zero in initialization#1094

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.

 Sign up for GitHub

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

 Merged

JuArce
merged 9 commits into

from

Sep 30, 2024
 Merged


fix(contracts): check address are not zero in initialization
#1094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
f9a8113

fix(contracts): check address are not zero in initialization


MarcosNicolau Sep 25, 2024
8071ca4

style: remove extra \n


uri-99 Sep 27, 2024
72e64dd

chore: remove extra comment


uri-99 Sep 27, 2024
79f272e

fix: make show aligned error codes


uri-99 Sep 27, 2024
ce274e4

chore: remove extra comment


uri-99 Sep 27, 2024
ea24501

fix(contracts): check address are not zero


MarcosNicolau Sep 27, 2024
d081866

test(contracts): fixed rewards coordinator initialization


MarcosNicolau Sep 30, 2024
869d179

Merge branch 'staging' into 1020-fixcontracts-batcherpaymentservice-c…


MarcosNicolau Sep 30, 2024
113e005

chore(contracts): aligned anvil state json


MarcosNicolau Sep 30, 2024

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


4 changes: 2 additions & 2 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -473,9 +473,9 @@ build_aligned_contracts:

show_aligned_error_codes:
	@echo "\nAlignedLayerServiceManager errors:"
	@cd contracts/src/core && forge inspect IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
	@cd contracts && forge inspect src/core/IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
	@echo "\nBatcherPaymentService errors:"
	@cd contracts/src/core && forge inspect BatcherPaymentService.sol:BatcherPaymentService errors
	@cd contracts && forge inspect src/core/BatcherPaymentService.sol:BatcherPaymentService errors

__BUILD__:
build_binaries:
Expand Down

2 changes: 1 addition & 1 deletion
contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

View file


Open in desktop


Large diffs are not rendered by default.


46 changes: 34 additions & 12 deletions
contracts/src/core/AlignedLayerServiceManager.sol

View file


Open in desktop

Comment thread
MarcosNicolau marked this conversation as resolved.

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,18 @@ contract AlignedLayerServiceManager is
 __stakeRegistry
 )
 {
 if (address(__avsDirectory) == address(0)) {
 revert InvalidAddress("avsDirectory");
 }
 if (address(__rewardsCoordinator) == address(0)) {
 revert InvalidAddress("rewardsCoordinator");
 }
 if (address(__registryCoordinator) == address(0)) {
 revert InvalidAddress("registryCoordinator");
 }
 if (address(__stakeRegistry) == address(0)) {
 revert InvalidAddress("stakeRegistry");
 }
 _disableInitializers();
 }

Expand All@@ -45,6 +57,15 @@ contract AlignedLayerServiceManager is
 address _rewardsInitiator,
 address _alignedAggregator
 ) public initializer {
 if (_initialOwner == address(0)) {
 revert InvalidAddress("initialOwner");
 }
 if (_rewardsInitiator == address(0)) {
 revert InvalidAddress("rewardsInitiator");
 }
 if (_alignedAggregator == address(0)) {
 revert InvalidAddress("alignedAggregator");
 }
 __ServiceManagerBase_init(_initialOwner, _rewardsInitiator);
 alignedAggregator = _alignedAggregator; //can't do setAggregator(aggregator) since caller is not the owner
 }
Expand DownExpand Up@@ -129,7 +150,7 @@ contract AlignedLayerServiceManager is
 if (currentBatch.responded) {
 revert BatchAlreadyResponded(batchIdentifierHash);
 }
 currentBatch.responded = true;
 currentBatch.responded = true;

 // Check that batcher has enough funds to fund response
 if (batchersBalances[senderAddress] < currentBatch.respondToTaskFeeLimit) {
Expand DownExpand Up@@ -181,7 +202,7 @@ contract AlignedLayerServiceManager is
 senderAddress,
 batchersBalances[senderAddress]
 );

 payable(alignedAggregator).transfer(txCost);
 }

Expand DownExpand Up@@ -240,16 +261,17 @@ contract AlignedLayerServiceManager is
 bytes memory merkleProof,
 uint256 verificationDataBatchIndex
 ) external view returns (bool) {
 return this.verifyBatchInclusion(
 proofCommitment,
 pubInputCommitment,
 provingSystemAuxDataCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex,
 address(0)
 );
 return
 this.verifyBatchInclusion(
 proofCommitment,
 pubInputCommitment,
 provingSystemAuxDataCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex,
 address(0)
 );
 }

 function setAggregator(address _alignedAggregator) public onlyOwner {
Expand Down

10 changes: 10 additions & 0 deletions
contracts/src/core/BatcherPaymentService.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ contract BatcherPaymentService is
 uint256 required
 ); // 955c0664
 error InvalidMerkleRoot(bytes32 expected, bytes32 actual); // 9f13b65c
 error InvalidAddress(string param); // 161eb542

 // CONSTRUCTOR & INITIALIZER
 constructor() EIP712("Aligned", "1") {
Expand All@@ -70,6 +71,15 @@ contract BatcherPaymentService is
 address _batcherWallet,
 bytes32 _noncedVerificationDataTypeHash
 ) public initializer {
 if (address(_alignedLayerServiceManager) == address(0)) {
 revert InvalidAddress("alignedServiceManager");
 }
 if (_batcherPaymentServiceOwner == address(0)) {
 revert InvalidAddress("batcherPaymentServiceOwner");
 }
 if (_batcherWallet == address(0)) {
 revert InvalidAddress("batcherWallet");
 }
 __Ownable_init(); // default is msg.sender
 __UUPSUpgradeable_init();
 _transferOwnership(_batcherPaymentServiceOwner);
Expand Down

1 change: 1 addition & 0 deletions
contracts/src/core/IAlignedLayerServiceManager.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ interface IAlignedLayerServiceManager {
 error SenderIsNotAggregator(address sender, address alignedAggregator); // 2cbe4195
 error InvalidDepositAmount(uint256 amount); // 412ed242
 error ExceededMaxRespondFee(uint256 respondToTaskFeeLimit, uint256 txCost); // 86fc507e
 error InvalidAddress(string param); // 161eb542

 function createNewTask(
 bytes32 batchMerkleRoot,
Expand Down

2 changes: 1 addition & 1 deletion
contracts/test/AlignedLayerServiceManager.t.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ contract AlignedLayerServiceManagerTest is BLSMockAVSDeployer {

 alignedLayerServiceManager = new AlignedLayerServiceManager(
 avsDirectory,
 IRewardsCoordinator(address(rewardsCoordinator)),
 IRewardsCoordinator(address(rewardsCoordinatorMock)),
 IRegistryCoordinator(address(registryCoordinator)),
 IStakeRegistry(address(stakeRegistry))
 );
Expand Down