Merge branch 'Layr-Labs:master' into master

bxue-l2 · Apr 16, 2024 · 19cea9b · 19cea9b
2 parents 9f1c3f7 + 6a50f91
commit 19cea9b
Show file tree

Hide file tree

Showing 18 changed files with 1,439 additions and 26 deletions.
diff --git a/contracts/bindings/AVSDirectory/binding.go b/contracts/bindings/AVSDirectory/binding.go
diff --git a/contracts/bindings/BLSApkRegistry/binding.go b/contracts/bindings/BLSApkRegistry/binding.go
diff --git a/contracts/bindings/BN254/binding.go b/contracts/bindings/BN254/binding.go
diff --git a/contracts/bindings/BitmapUtils/binding.go b/contracts/bindings/BitmapUtils/binding.go
diff --git a/contracts/bindings/DelegationManager/binding.go b/contracts/bindings/DelegationManager/binding.go
diff --git a/contracts/bindings/EigenDAServiceManager/binding.go b/contracts/bindings/EigenDAServiceManager/binding.go
diff --git a/contracts/bindings/EjectionManager/binding.go b/contracts/bindings/EjectionManager/binding.go
diff --git a/contracts/bindings/IndexRegistry/binding.go b/contracts/bindings/IndexRegistry/binding.go
diff --git a/contracts/bindings/MockRollup/binding.go b/contracts/bindings/MockRollup/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/StakeRegistry/binding.go b/contracts/bindings/StakeRegistry/binding.go
diff --git a/contracts/compile.sh b/contracts/compile.sh
@@ -21,7 +21,7 @@ function create_binding {
 forge clean
 forge build
 
-contracts="AVSDirectory DelegationManager BitmapUtils OperatorStateRetriever RegistryCoordinator BLSApkRegistry IndexRegistry StakeRegistry BN254 EigenDAServiceManager IEigenDAServiceManager MockRollup"
+contracts="AVSDirectory DelegationManager BitmapUtils OperatorStateRetriever RegistryCoordinator BLSApkRegistry IndexRegistry StakeRegistry BN254 EigenDAServiceManager IEigenDAServiceManager MockRollup EjectionManager"
 for contract in $contracts; do
     create_binding ./ $contract ./bindings
 done

diff --git a/contracts/lib/eigenlayer-middleware b/contracts/lib/eigenlayer-middleware
diff --git a/contracts/lib/forge-std b/contracts/lib/forge-std
diff --git a/contracts/script/DeployOpenEigenLayer.s.sol b/contracts/script/DeployOpenEigenLayer.s.sol
@@ -34,7 +34,7 @@ import "forge-std/Test.sol";
 // # To deploy and verify our contract
 // forge script script/M1_Deploy.s.sol:Deployer_M1 --rpc-url $RPC_URL  --private-key $PRIVATE_KEY --broadcast -vvvv
 contract DeployOpenEigenLayer is Script, Test {
-    Vm cheats = Vm(HEVM_ADDRESS);
+    Vm cheats = Vm(VM_ADDRESS);
 
     // struct used to encode token info in config file
     struct StrategyConfig {

diff --git a/contracts/src/Imports.sol b/contracts/src/Imports.sol
@@ -3,3 +3,4 @@
 import "eigenlayer-middleware/OperatorStateRetriever.sol";
 import "eigenlayer-middleware/BLSApkRegistry.sol";
 import "eigenlayer-middleware/RegistryCoordinator.sol";
+import "eigenlayer-middleware/EjectionManager.sol";
diff --git a/encoding/kzg/verifier/verifier.go b/encoding/kzg/verifier/verifier.go
@@ -70,21 +70,24 @@ func NewVerifier(config *kzg.KzgConfig, loadG2Points bool) (*Verifier, error) {
 			return nil, err
 		}
 	} else {
-		if len(config.G2PowerOf2Path) == 0 {
-			return nil, errors.New("G2PowerOf2Path is empty. However, object needs to load G2Points")
+		if len(config.G2PowerOf2Path) == 0 && len(config.G2Path) == 0 {
+			return nil, errors.New("both G2Path and G2PowerOf2Path are empty. However, object needs to load G2Points")
 		}
 
-		if config.SRSOrder == 0 {
-			return nil, errors.New("SRS order cannot be 0")
-		}
-
-		maxPower := uint64(math.Log2(float64(config.SRSOrder)))
-		_, err := kzg.ReadG2PointSection(config.G2PowerOf2Path, 0, maxPower, 1)
-		if err != nil {
-			return nil, fmt.Errorf("file located at %v is invalid", config.G2PowerOf2Path)
+		if len(config.G2PowerOf2Path) != 0 {
+			if config.SRSOrder == 0 {
+				return nil, errors.New("SRS order cannot be 0")
+			}
+
+			maxPower := uint64(math.Log2(float64(config.SRSOrder)))
+			_, err := kzg.ReadG2PointSection(config.G2PowerOf2Path, 0, maxPower, 1)
+			if err != nil {
+				return nil, fmt.Errorf("file located at %v is invalid", config.G2PowerOf2Path)
+			}
+		} else {
+			log.Println("verifier requires accesses to entire g2 points. It is a legacy usage. For most operators, it is likely because G2_POWER_OF_2_PATH is improperly configured.")
 		}
 	}
-
 	srs, err := kzg.NewSrs(s1, s2)
 	if err != nil {
 		log.Println("Could not create srs", err)
+0 −3		.gitmodules
+24 −10		README.md
+6 −0		foundry.toml
+0 −1		lib/ds-test
+1 −1		lib/eigenlayer-contracts
+1 −1		lib/forge-std
+2 −2		script/ServiceManagerRouterDeploy.s.sol
+1 −1		src/BLSApkRegistry.sol
+1 −1		src/BLSApkRegistryStorage.sol
+1 −1		src/BLSSignatureChecker.sol
+182 −0		src/EjectionManager.sol
+1 −1		src/IndexRegistry.sol
+1 −1		src/IndexRegistryStorage.sol
+1 −1		src/OperatorStateRetriever.sol
+1 −1		src/RegistryCoordinator.sol
+2 −2		src/RegistryCoordinatorStorage.sol
+1 −1		src/ServiceManagerBase.sol
+2 −2		src/ServiceManagerRouter.sol
+1 −1		src/StakeRegistry.sol
+1 −1		src/StakeRegistryStorage.sol
+1 −1		src/interfaces/IBLSApkRegistry.sol
+1 −1		src/interfaces/IBLSSignatureChecker.sol
+55 −0		src/interfaces/IEjectionManager.sol
+2 −2		src/interfaces/IIndexRegistry.sol
+1 −1		src/interfaces/IRegistryCoordinator.sol
+1 −1		src/interfaces/ISocketUpdater.sol
+2 −2		src/interfaces/IStakeRegistry.sol
+1 −1		src/libraries/BN254.sol
+2 −2		src/libraries/BitmapUtils.sol
+1 −1		test/events/IBLSApkRegistryEvents.sol
+1 −1		test/events/IIndexRegistryEvents.sol
+2 −2		test/events/IStakeRegistryEvents.sol
+2 −2		test/ffi/BLSPubKeyCompendiumFFI.t.sol
+1 −1		test/ffi/BLSSignatureCheckerFFI.t.sol
+2 −2		test/ffi/UpdateOperators.t.sol
+1 −1		test/ffi/util/G2Operations.sol
+1 −1		test/harnesses/BLSApkRegistryHarness.sol
+1 −1		test/harnesses/BitmapUtilsWrapper.sol
+1 −1		test/harnesses/RegistryCoordinatorHarness.t.sol
+1 −1		test/harnesses/StakeRegistryHarness.sol
+1 −1		test/integration/CoreRegistration.t.sol
+2 −2		test/integration/IntegrationBase.t.sol
+2 −2		test/integration/IntegrationChecks.t.sol
+2 −2		test/integration/IntegrationConfig.t.sol
+2 −2		test/integration/IntegrationDeployer.t.sol
+3 −3		test/integration/TimeMachine.t.sol
+3 −3		test/integration/User.t.sol
+2 −2		test/integration/mocks/BeaconChainOracleMock.t.sol
+2 −2		test/integration/tests/Full_Register_Deregister.t.sol
+2 −2		test/integration/tests/NonFull_Register_CoreBalanceChange_Update.t.sol
+2 −2		test/integration/tests/NonFull_Register_Deregister.t.sol
+2 −2		test/integration/utils/BitmapStrings.t.sol
+2 −2		test/integration/utils/Sort.t.sol
+1 −1		test/mocks/AVSDirectoryMock.sol
+2 −2		test/mocks/DelegationMock.sol
+1 −1		test/mocks/RegistryCoordinatorMock.sol
+1 −1		test/mocks/ServiceManagerMock.sol
+1 −1		test/mocks/StakeRegistryMock.sol
+1 −1		test/unit/BLSApkRegistryUnit.t.sol
+1 −1		test/unit/BLSSignatureCheckerUnit.t.sol
+2 −2		test/unit/BitmapUtils.t.sol
+418 −0		test/unit/EjectionManagerUnit.t.sol
+2 −2		test/unit/OperatorStateRetrieverUnit.t.sol
+1 −1		test/unit/RegistryCoordinatorUnit.t.sol
+2 −2		test/unit/ServiceManagerRouter.t.sol
+1 −1		test/unit/StakeRegistryUnit.t.sol
+1 −1		test/unit/Utils.sol
+1 −1		test/utils/BLSMockAVSDeployer.sol
+2 −2		test/utils/MockAVSDeployer.sol
+1 −1		test/utils/Operators.sol
+1 −1		test/utils/Owners.sol
+1 −1		test/utils/ProofParsing.sol
+1 −1		test/utils/SignatureCompaction.sol
+1 −0		.gitattributes
+48 −6		.github/workflows/ci.yml
+0 −3		.gitmodules
+1 −1		README.md
+1 −1		foundry.toml
+0 −1		lib/ds-test
+1 −1		package.json
+635 −0		scripts/vm.py
+4 −3		src/Script.sol
+518 −225		src/StdAssertions.sol
+26 −7		src/StdChains.sol
+156 −15		src/StdCheats.sol
+16 −1		src/StdInvariant.sol
+25 −25		src/StdJson.sol
+244 −98		src/StdStorage.sol
+2 −2		src/StdStyle.sol
+179 −0		src/StdToml.sol
+62 −34		src/StdUtils.sol
+7 −6		src/Test.sol
+1,516 −374		src/Vm.sol
+234 −0		src/mocks/MockERC20.sol
+235 −0		src/mocks/MockERC721.sol
+44 −898		test/StdAssertions.t.sol
+116 −55		test/StdChains.t.sol
+178 −67		test/StdCheats.t.sol
+13 −11		test/StdError.t.sol
+49 −0		test/StdJson.t.sol
+27 −12		test/StdMath.t.sol
+222 −42		test/StdStorage.t.sol
+4 −4		test/StdStyle.t.sol
+49 −0		test/StdToml.t.sol
+66 −36		test/StdUtils.t.sol
+15 −0		test/Vm.t.sol
+8 −0		test/fixtures/test.json
+6 −0		test/fixtures/test.toml
+441 −0		test/mocks/MockERC20.t.sol
+721 −0		test/mocks/MockERC721.t.sol