Merge branch 'dev' into add_read_only_builder

Layr-Labs · Aug 16, 2024 · 52bcfa2 · 52bcfa2
2 parents 1a6d0b7 + 4654b5c
commit 52bcfa2
Show file tree

Hide file tree

Showing 16 changed files with 1,754 additions and 929 deletions.
diff --git a/chainio/clients/elcontracts/reader.go b/chainio/clients/elcontracts/reader.go
@@ -261,3 +261,23 @@ func (r *ChainReader) CurrRewardsCalculationEndTimestamp(opts *bind.CallOpts) (u
 
 	return r.rewardsCoordinator.CurrRewardsCalculationEndTimestamp(opts)
 }
+
+func (r *ChainReader) GetCurrentClaimableDistributionRoot(
+	opts *bind.CallOpts,
+) (rewardscoordinator.IRewardsCoordinatorDistributionRoot, error) {
+	if r.rewardsCoordinator == nil {
+		return rewardscoordinator.IRewardsCoordinatorDistributionRoot{}, errors.New(
+			"RewardsCoordinator contract not provided",
+		)
+	}
+
+	return r.rewardsCoordinator.GetCurrentClaimableDistributionRoot(opts)
+}
+
+func (r *ChainReader) GetRootIndexFromHash(opts *bind.CallOpts, rootHash [32]byte) (uint32, error) {
+	if r.rewardsCoordinator == nil {
+		return 0, errors.New("RewardsCoordinator contract not provided")
+	}
+
+	return r.rewardsCoordinator.GetRootIndexFromHash(opts, rootHash)
+}
diff --git a/contracts/bindings/BLSApkRegistry/binding.go b/contracts/bindings/BLSApkRegistry/binding.go
diff --git a/contracts/bindings/DelegationManager/binding.go b/contracts/bindings/DelegationManager/binding.go
diff --git a/contracts/bindings/EigenPod/binding.go b/contracts/bindings/EigenPod/binding.go
diff --git a/contracts/bindings/EigenPodManager/binding.go b/contracts/bindings/EigenPodManager/binding.go
diff --git a/contracts/bindings/IAVSDirectory/binding.go b/contracts/bindings/IAVSDirectory/binding.go
diff --git a/contracts/bindings/IRewardsCoordinator/binding.go b/contracts/bindings/IRewardsCoordinator/binding.go
diff --git a/contracts/bindings/IStrategy/binding.go b/contracts/bindings/IStrategy/binding.go
diff --git a/contracts/bindings/IndexRegistry/binding.go b/contracts/bindings/IndexRegistry/binding.go
diff --git a/contracts/bindings/MockAvsServiceManager/binding.go b/contracts/bindings/MockAvsServiceManager/binding.go
diff --git a/contracts/bindings/OperatorStateRetriever/binding.go b/contracts/bindings/OperatorStateRetriever/binding.go
diff --git a/contracts/bindings/RegistryCoordinator/binding.go b/contracts/bindings/RegistryCoordinator/binding.go
diff --git a/contracts/bindings/ServiceManagerBase/binding.go b/contracts/bindings/ServiceManagerBase/binding.go
diff --git a/contracts/bindings/StakeRegistry/binding.go b/contracts/bindings/StakeRegistry/binding.go
diff --git a/contracts/bindings/StrategyManager/binding.go b/contracts/bindings/StrategyManager/binding.go
diff --git a/contracts/lib/eigenlayer-middleware b/contracts/lib/eigenlayer-middleware
+1 −1		lib/eigenlayer-contracts
+237 −151		src/RegistryCoordinator.sol
+166 −7		src/ServiceManagerBase.sol
+2 −0		src/ServiceManagerBaseStorage.sol
+2 −0		src/interfaces/IServiceManager.sol
+61 −0		src/libraries/LibMergeSort.sol
+27 −0		src/libraries/SignatureCheckerLib.sol
+68 −0		test/harnesses/AVSDirectoryHarness.sol
+22 −22		test/integration/IntegrationDeployer.t.sol
+4 −3		test/integration/mocks/BeaconChainOracleMock.t.sol
+24 −5		test/mocks/AVSDirectoryMock.sol
+8 −1		test/mocks/ECDSAServiceManagerMock.sol
+4 −0		test/mocks/RewardsCoordinatorMock.sol
+188 −0		test/unit/LibMergeSort.t.sol
+200 −0		test/unit/RegistryCoordinatorMigration.t.sol
+8 −2		test/unit/ServiceManagerBase.t.sol
+347 −0		test/unit/ServiceManagerMigration.t.sol
+4 −3		test/utils/MockAVSDeployer.sol