Skip to content
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
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,8 @@ make start-all
# Deploy (override: FOUNDRY_ANVIL_PRIVATE_KEY)
forge script ./script/WavsServiceManager.s.sol --rpc-url http://localhost:8545 --broadcast

# Grab deployed service manager address by name
BROADCAST_FILE=./broadcast/WavsServiceManager.s.sol/31337/run-latest.json
export SERVICE_MANAGER_ADDRESS=`jq -r '.transactions[] | select(.contractName == "WavsServiceManager") | .contractAddress' "${BROADCAST_FILE}"`
# Grab deployed service manager from script file output
export SERVICE_MANAGER_ADDRESS=`jq -r '.service_manager' "./.docker/cli/script_deploy.json"`
echo "Service Manager Address: $SERVICE_MANAGER_ADDRESS"
```

Expand All @@ -102,7 +101,7 @@ make wasi-build
sudo chmod 0666 .docker/cli/deployments.json

# Contract trigger function signature to listen for
trigger_event=$(cast sig-event "NewTrigger(bytes)"); echo $trigger_event
trigger_event=$(cast sig-event "NewTrigger(bytes)"); echo "Trigger Event: $trigger_event"

service_info=`wavs-cli deploy-service --log-level=error --data ./.docker/cli --component $(pwd)/compiled/eth_trigger_weather.wasm \
--trigger-event-name ${trigger_event:2} \
Expand Down
2 changes: 1 addition & 1 deletion foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ libs = ['lib']
solidity_version = '0.8.22'
evm_version = 'shanghai'
via_ir = true
fs_permissions = [{ access = "read", path = "./" },]
fs_permissions = [{ access = "read-write", path = "./" },]

# See more config options https://github.com/foundry-rs/foundry/tree/master/config
1 change: 1 addition & 0 deletions remappings.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@layer-contracts=lib/WAVS/sdk/solidity/contracts/
@eigenlayer/middleware=lib/WAVS/lib/eigenlayer-middleware/
@openzeppelin-upgrades/=lib/WAVS/lib/eigenlayer-middleware/lib/openzeppelin-contracts-upgradeable/
@openzeppelin-contracts=lib/WAVS/lib/eigenlayer-middleware/lib/openzeppelin-contracts/contracts/
37 changes: 23 additions & 14 deletions script/WavsServiceManager.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,18 @@ import {IDelegationManager} from
import {Quorum, StrategyParams} from "@eigenlayer/middleware/src/interfaces/IECDSAStakeRegistryEventsAndErrors.sol";
import {IStrategy} from "@eigenlayer/middleware/lib/eigenlayer-contracts/src/contracts/interfaces/IStrategy.sol";
import {stdJson} from "forge-std/StdJson.sol";
import { Strings } from "@openzeppelin-contracts/utils/Strings.sol";


struct EigenContracts {
address delegation_manager;
address rewards_coordinator;
address avs_directory;
}

// forge script ./script/WavsServiceManager.s.sol --rpc-url http://localhost:8545 --broadcast --var-ir
// forge script ./script/WavsServiceManager.s.sol --rpc-url http://localhost:8545 --broadcast
contract WavsServiceManagerScript is Script {
using stdJson for string;

string root = vm.projectRoot();
string deployments_path = string.concat(root, "/.docker/cli/deployments.json");
string script_output_path = string.concat(root, "/.docker/cli/script_deploy.json");

uint256 privateKey = vm.envOr(
"FOUNDRY_ANVIL_PRIVATE_KEY", uint256(0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80)
);
Expand All @@ -29,7 +30,7 @@ contract WavsServiceManagerScript is Script {
function run() public {
vm.startBroadcast(privateKey);

EigenContracts memory eigen = loadEigenContractsFromFS("deployments.json");
EigenContracts memory eigen = loadEigenContractsFromFS();

ECDSAStakeRegistry ecdsa_registry = new ECDSAStakeRegistry(IDelegationManager(eigen.delegation_manager));

Expand All @@ -48,15 +49,17 @@ contract WavsServiceManagerScript is Script {

vm.stopBroadcast();

console.log("ServiceManager:", address(sm));
console.log("ecdssa_registry (deployed):", address(ecdsa_registry));
}
console.log("ecdsa_registry:", address(ecdsa_registry));
console.log("service_manager:", address(sm));

function loadEigenContractsFromFS(string memory fileName) public view returns (EigenContracts memory) {
string memory root = vm.projectRoot();
string memory path = string.concat(root, "/.docker/cli/", fileName);
string memory json = vm.readFile(path);
string memory json = "json";
json.serialize("service_manager", Strings.toHexString(address(sm)));
string memory finalJson = json.serialize("ecdsa_registry", Strings.toHexString(address(ecdsa_registry)));
vm.writeFile(script_output_path, finalJson);
}

function loadEigenContractsFromFS() public view returns (EigenContracts memory) {
string memory json = vm.readFile(deployments_path);
address dm = address(uint160(bytes20(json.readBytes(".eigen_core.local.delegation_manager"))));
address rc = address(uint160(bytes20(json.readBytes(".eigen_core.local.rewards_coordinator"))));
address avs = address(uint160(bytes20(json.readBytes(".eigen_core.local.avs_directory"))));
Expand All @@ -67,3 +70,9 @@ contract WavsServiceManagerScript is Script {
return fixture;
}
}

struct EigenContracts {
address delegation_manager;
address rewards_coordinator;
address avs_directory;
}