Skip to content

Commit cb7ff46

Browse files
committed
fix: working impl for v0.3.0-alpha.2
1 parent 7327c19 commit cb7ff46

18 files changed

+2049
-58
lines changed

README.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ make start-all
7474
### Upload your WAVS Service Manager
7575

7676
```bash
77-
# Deploy (override: FOUNDRY_ANVIL_PRIVATE_KEY)
77+
# Deploy
78+
export FOUNDRY_ANVIL_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
7879
forge script ./script/WavsSubmit.s.sol --rpc-url http://localhost:8545 --broadcast
7980

8081
# Grab deployed service manager from script file output
@@ -84,7 +85,13 @@ echo "Service Handler Addr: $SERVICE_HANDLER_ADDR"
8485
export TRIGGER_ADDR=`jq -r '.trigger' "./.docker/cli/script_deploy.json"`; echo "Trigger Addr: $TRIGGER_ADDR"
8586

8687
wavs-cli deploy-eigen-service-manager --data ./.docker/cli --service-handler ${SERVICE_HANDLER_ADDR}
87-
export SERVICE_MANAGER=0xf4b146fba71f41e0592668ffbf264f1d186b2ca8 # manually parsing because json output is terrible
88+
export SERVICE_MANAGER=0x0e801d84fa97b50751dbf25036d067dcf18858bf
89+
90+
# Set the service manager in the service handler
91+
# - handleAddPayload can only be called by onlyServiceManager
92+
# - add-task requires to getServiceManager() from the contract to deploy
93+
cast send ${SERVICE_HANDLER_ADDR} "setServiceManager(address)" ${SERVICE_MANAGER} --rpc-url http://localhost:8545 --private-key $FOUNDRY_ANVIL_PRIVATE_KEY
94+
# cast call ${SERVICE_HANDLER_ADDR} "getServiceManager()(address)" --rpc-url http://localhost:8545
8895
```
8996

9097
### Build WASI components
@@ -111,18 +118,17 @@ trigger_event=$(cast sig-event "NewTrigger(bytes)"); echo "Trigger Event: $trigg
111118
service_info=`wavs-cli deploy-service --log-level=error --data ./.docker/cli --component $(pwd)/compiled/eth_trigger_weather.wasm \
112119
--trigger-event-name ${trigger_event:2} \
113120
--trigger eth-contract-event \
121+
--trigger-address ${TRIGGER_ADDR} \
114122
--submit-address ${SERVICE_MANAGER} \
115123
--service-config '{"fuelLimit":100000000,"maxGas":5000000,"hostEnvs":["WAVS_ENV_OPEN_WEATHER_API_KEY"],"kv":[],"workflowId":"default","componentId":"default"}'`
116124

117125
echo "Service info: $service_info"
118126

119-
# TODO: inform about the other for security
120-
121127
# Submit AVS request -> chain
122128
SERVICE_ID=`echo $service_info | jq -r .service[0]`; echo "Service ID: $SERVICE_ID"
123129
wavs-cli add-task --input "Nashville,TN" --data ./.docker/cli --service-id ${SERVICE_ID}
124130

125131
# Grab data from the contract directly
126-
hex_bytes=$(cast decode-abi "getData(uint64)(bytes)" `cast call ${SERVICE_MANAGER_ADDRESS} "getData(uint64)" 1`)
132+
hex_bytes=$(cast decode-abi "getData(uint64)(bytes)" `cast call ${SERVICE_HANDLER_ADDR} "getData(uint64)" 1`)
127133
echo `cast --to-ascii $hex_bytes`
128134
```

crates/bindings/src/addressupgradeable.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@ pub mod AddressUpgradeable {
2222
/// The creation / init bytecode of the contract.
2323
///
2424
/// ```text
25-
///0x6080806040523460175760399081601c823930815050f35b5f80fdfe5f80fdfea26469706673582212206f0fc9d8c12fdb89aaf558daf659b837a6f1b639d9046085b0d8a28c2ca1905264736f6c634300081a0033
25+
///0x6080806040523460175760399081601c823930815050f35b5f80fdfe5f80fdfea2646970667358221220d8164faad3769fbec54201994879a2201f48000cde6b747dafc7f9d2bae0777b64736f6c634300081c0033
2626
/// ```
2727
#[rustfmt::skip]
2828
#[allow(clippy::all)]
2929
pub static BYTECODE: alloy_sol_types::private::Bytes = alloy_sol_types::private::Bytes::from_static(
30-
b"`\x80\x80`@R4`\x17W`9\x90\x81`\x1C\x8290\x81PP\xF3[_\x80\xFD\xFE_\x80\xFD\xFE\xA2dipfsX\"\x12 o\x0F\xC9\xD8\xC1/\xDB\x89\xAA\xF5X\xDA\xF6Y\xB87\xA6\xF1\xB69\xD9\x04`\x85\xB0\xD8\xA2\x8C,\xA1\x90RdsolcC\0\x08\x1A\x003",
30+
b"`\x80\x80`@R4`\x17W`9\x90\x81`\x1C\x8290\x81PP\xF3[_\x80\xFD\xFE_\x80\xFD\xFE\xA2dipfsX\"\x12 \xD8\x16O\xAA\xD3v\x9F\xBE\xC5B\x01\x99Hy\xA2 \x1FH\0\x0C\xDEkt}\xAF\xC7\xF9\xD2\xBA\xE0w{dsolcC\0\x08\x1C\x003",
3131
);
3232
/// The runtime bytecode of the contract, as deployed on the network.
3333
///
3434
/// ```text
35-
///0x5f80fdfea26469706673582212206f0fc9d8c12fdb89aaf558daf659b837a6f1b639d9046085b0d8a28c2ca1905264736f6c634300081a0033
35+
///0x5f80fdfea2646970667358221220d8164faad3769fbec54201994879a2201f48000cde6b747dafc7f9d2bae0777b64736f6c634300081c0033
3636
/// ```
3737
#[rustfmt::skip]
3838
#[allow(clippy::all)]
3939
pub static DEPLOYED_BYTECODE: alloy_sol_types::private::Bytes = alloy_sol_types::private::Bytes::from_static(
40-
b"_\x80\xFD\xFE\xA2dipfsX\"\x12 o\x0F\xC9\xD8\xC1/\xDB\x89\xAA\xF5X\xDA\xF6Y\xB87\xA6\xF1\xB69\xD9\x04`\x85\xB0\xD8\xA2\x8C,\xA1\x90RdsolcC\0\x08\x1A\x003",
40+
b"_\x80\xFD\xFE\xA2dipfsX\"\x12 \xD8\x16O\xAA\xD3v\x9F\xBE\xC5B\x01\x99Hy\xA2 \x1FH\0\x0C\xDEkt}\xAF\xC7\xF9\xD2\xBA\xE0w{dsolcC\0\x08\x1C\x003",
4141
);
4242
use alloy::contract as alloy_contract;
4343
/**Creates a new wrapper around an on-chain [`AddressUpgradeable`](self) contract instance.

crates/bindings/src/checkpointsupgradeable.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@ pub mod CheckpointsUpgradeable {
2222
/// The creation / init bytecode of the contract.
2323
///
2424
/// ```text
25-
///0x6080806040523460175760399081601c823930815050f35b5f80fdfe5f80fdfea264697066735822122031bcd1780b52ccc37391f08b5096cb7b0cb0cdf457d47f49ea47b9a065e29a7264736f6c634300081a0033
25+
///0x6080806040523460175760399081601c823930815050f35b5f80fdfe5f80fdfea2646970667358221220e0775b3bb8799e6baeab470d5f74316b85a24b4ed68026efab3cbfd3d4feb7c664736f6c634300081c0033
2626
/// ```
2727
#[rustfmt::skip]
2828
#[allow(clippy::all)]
2929
pub static BYTECODE: alloy_sol_types::private::Bytes = alloy_sol_types::private::Bytes::from_static(
30-
b"`\x80\x80`@R4`\x17W`9\x90\x81`\x1C\x8290\x81PP\xF3[_\x80\xFD\xFE_\x80\xFD\xFE\xA2dipfsX\"\x12 1\xBC\xD1x\x0BR\xCC\xC3s\x91\xF0\x8BP\x96\xCB{\x0C\xB0\xCD\xF4W\xD4\x7FI\xEAG\xB9\xA0e\xE2\x9ArdsolcC\0\x08\x1A\x003",
30+
b"`\x80\x80`@R4`\x17W`9\x90\x81`\x1C\x8290\x81PP\xF3[_\x80\xFD\xFE_\x80\xFD\xFE\xA2dipfsX\"\x12 \xE0w[;\xB8y\x9Ek\xAE\xABG\r_t1k\x85\xA2KN\xD6\x80&\xEF\xAB<\xBF\xD3\xD4\xFE\xB7\xC6dsolcC\0\x08\x1C\x003",
3131
);
3232
/// The runtime bytecode of the contract, as deployed on the network.
3333
///
3434
/// ```text
35-
///0x5f80fdfea264697066735822122031bcd1780b52ccc37391f08b5096cb7b0cb0cdf457d47f49ea47b9a065e29a7264736f6c634300081a0033
35+
///0x5f80fdfea2646970667358221220e0775b3bb8799e6baeab470d5f74316b85a24b4ed68026efab3cbfd3d4feb7c664736f6c634300081c0033
3636
/// ```
3737
#[rustfmt::skip]
3838
#[allow(clippy::all)]
3939
pub static DEPLOYED_BYTECODE: alloy_sol_types::private::Bytes = alloy_sol_types::private::Bytes::from_static(
40-
b"_\x80\xFD\xFE\xA2dipfsX\"\x12 1\xBC\xD1x\x0BR\xCC\xC3s\x91\xF0\x8BP\x96\xCB{\x0C\xB0\xCD\xF4W\xD4\x7FI\xEAG\xB9\xA0e\xE2\x9ArdsolcC\0\x08\x1A\x003",
40+
b"_\x80\xFD\xFE\xA2dipfsX\"\x12 \xE0w[;\xB8y\x9Ek\xAE\xABG\r_t1k\x85\xA2KN\xD6\x80&\xEF\xAB<\xBF\xD3\xD4\xFE\xB7\xC6dsolcC\0\x08\x1C\x003",
4141
);
4242
use alloy::contract as alloy_contract;
4343
/**Creates a new wrapper around an on-chain [`CheckpointsUpgradeable`](self) contract instance.

crates/bindings/src/ecdsastakeregistry.rs

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.

crates/bindings/src/ecdsaupgradeable.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@ pub mod ECDSAUpgradeable {
2222
/// The creation / init bytecode of the contract.
2323
///
2424
/// ```text
25-
///0x6080806040523460175760399081601c823930815050f35b5f80fdfe5f80fdfea264697066735822122042c3761187f4993cb9086815e8fb7e3f21a5e806922b7003116ef10ed394cb4664736f6c634300081a0033
25+
///0x6080806040523460175760399081601c823930815050f35b5f80fdfe5f80fdfea26469706673582212208bdd623334d76678a96e5c8762ef91c7ecbe39f74ff1f9b3a557dabecdfc8ee764736f6c634300081c0033
2626
/// ```
2727
#[rustfmt::skip]
2828
#[allow(clippy::all)]
2929
pub static BYTECODE: alloy_sol_types::private::Bytes = alloy_sol_types::private::Bytes::from_static(
30-
b"`\x80\x80`@R4`\x17W`9\x90\x81`\x1C\x8290\x81PP\xF3[_\x80\xFD\xFE_\x80\xFD\xFE\xA2dipfsX\"\x12 B\xC3v\x11\x87\xF4\x99<\xB9\x08h\x15\xE8\xFB~?!\xA5\xE8\x06\x92+p\x03\x11n\xF1\x0E\xD3\x94\xCBFdsolcC\0\x08\x1A\x003",
30+
b"`\x80\x80`@R4`\x17W`9\x90\x81`\x1C\x8290\x81PP\xF3[_\x80\xFD\xFE_\x80\xFD\xFE\xA2dipfsX\"\x12 \x8B\xDDb34\xD7fx\xA9n\\\x87b\xEF\x91\xC7\xEC\xBE9\xF7O\xF1\xF9\xB3\xA5W\xDA\xBE\xCD\xFC\x8E\xE7dsolcC\0\x08\x1C\x003",
3131
);
3232
/// The runtime bytecode of the contract, as deployed on the network.
3333
///
3434
/// ```text
35-
///0x5f80fdfea264697066735822122042c3761187f4993cb9086815e8fb7e3f21a5e806922b7003116ef10ed394cb4664736f6c634300081a0033
35+
///0x5f80fdfea26469706673582212208bdd623334d76678a96e5c8762ef91c7ecbe39f74ff1f9b3a557dabecdfc8ee764736f6c634300081c0033
3636
/// ```
3737
#[rustfmt::skip]
3838
#[allow(clippy::all)]
3939
pub static DEPLOYED_BYTECODE: alloy_sol_types::private::Bytes = alloy_sol_types::private::Bytes::from_static(
40-
b"_\x80\xFD\xFE\xA2dipfsX\"\x12 B\xC3v\x11\x87\xF4\x99<\xB9\x08h\x15\xE8\xFB~?!\xA5\xE8\x06\x92+p\x03\x11n\xF1\x0E\xD3\x94\xCBFdsolcC\0\x08\x1A\x003",
40+
b"_\x80\xFD\xFE\xA2dipfsX\"\x12 \x8B\xDDb34\xD7fx\xA9n\\\x87b\xEF\x91\xC7\xEC\xBE9\xF7O\xF1\xF9\xB3\xA5W\xDA\xBE\xCD\xFC\x8E\xE7dsolcC\0\x08\x1C\x003",
4141
);
4242
use alloy::contract as alloy_contract;
4343
/**Creates a new wrapper around an on-chain [`ECDSAUpgradeable`](self) contract instance.

0 commit comments

Comments
 (0)