Skip to content

Commit b67df92

Browse files
committed
figurign out
1 parent 6b1c016 commit b67df92

File tree

4 files changed

+60
-16
lines changed

4 files changed

+60
-16
lines changed

target_chains/fuel/contracts/pyth-contract/out/release/pyth-contract-abi.json

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,10 @@
195195
{
196196
"type": "u64",
197197
"concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0"
198+
},
199+
{
200+
"type": "u8",
201+
"concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b"
198202
}
199203
],
200204
"metadataTypes": [
@@ -750,7 +754,7 @@
750754
"components": [
751755
{
752756
"name": "version",
753-
"typeId": 34
757+
"typeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b"
754758
},
755759
{
756760
"name": "guardian_set_index",
@@ -782,7 +786,7 @@
782786
},
783787
{
784788
"name": "consistency_level",
785-
"typeId": 34
789+
"typeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b"
786790
},
787791
{
788792
"name": "payload",
@@ -973,10 +977,6 @@
973977
"typeParameters": [
974978
8
975979
]
976-
},
977-
{
978-
"type": "u8",
979-
"metadataTypeId": 34
980980
}
981981
],
982982
"functions": [
@@ -1542,6 +1542,22 @@
15421542
"logId": "15458268789670052309",
15431543
"concreteTypeId": "d686cd9012ca81d56b62946d7a0bbec125a19237443e81495493c08426a76b1b"
15441544
},
1545+
{
1546+
"logId": "14832741149864513620",
1547+
"concreteTypeId": "cdd87b7d12fe505416570c294c884bca819364863efe3bf539245fa18515fbbb"
1548+
},
1549+
{
1550+
"logId": "1515152261580153489",
1551+
"concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0"
1552+
},
1553+
{
1554+
"logId": "14454674236531057292",
1555+
"concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b"
1556+
},
1557+
{
1558+
"logId": "10098701174489624218",
1559+
"concreteTypeId": "8c25cb3686462e9a86d2883c5688a22fe738b0bbc85f458d2d2b5f3f667c6d5a"
1560+
},
15451561
{
15461562
"logId": "15522444483018429170",
15471563
"concreteTypeId": "d76acd04100912f23d6d0798c810021f2332efc785fe432091a7f873140fb097"
@@ -1554,10 +1570,6 @@
15541570
"logId": "13826841070488844162",
15551571
"concreteTypeId": "bfe2ceb22444f7821c75d478fb595c4642cbf8970f8ec8960637a7c9aa6690c2"
15561572
},
1557-
{
1558-
"logId": "10098701174489624218",
1559-
"concreteTypeId": "8c25cb3686462e9a86d2883c5688a22fe738b0bbc85f458d2d2b5f3f667c6d5a"
1560-
},
15611573
{
15621574
"logId": "1142064842477676760",
15631575
"concreteTypeId": "0fd96dec5e5828d8a3e64d70e2d2962b1b7f4d0a8f1d6c9e035ce65e7c97679b"
@@ -1596,7 +1608,7 @@
15961608
{
15971609
"name": "DEPLOYER",
15981610
"concreteTypeId": "ab7cd04e05be58e3fc15d424c2c4a57f824a2a2d97d67252440a3925ebdc1335",
1599-
"offset": 105536,
1611+
"offset": 106784,
16001612
"indirect": false
16011613
}
16021614
],
Binary file not shown.

target_chains/fuel/contracts/pyth-interface/src/data_structures/wormhole_light.sw

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,25 +112,57 @@ impl GuardianSetUpgrade {
112112
StorageKey::<StorageVec<b256>>::new(ZERO_B256, 0, sha256(("guardian_set_keys", new_guardian_set_index))),
113113
);
114114
let mut i: u8 = 0;
115+
log(encoded_upgrade);
116+
log(encoded_upgrade.len());
117+
log(guardian_length);
115118
while i < guardian_length {
116119
let (_, slice) = encoded_upgrade.split_at(index);
120+
121+
log(index);
122+
log(slice);
123+
117124
let (key, _) = slice.split_at(20);
118-
let key: b256 = b256::from_be_bytes(key.clone());
125+
126+
log(key);
127+
128+
revert(0u64);
129+
let mut full_address_key = Bytes::with_capacity(32);
130+
131+
132+
let mut i = 0;
133+
while i < 12 {
134+
full_address_key.push(0u8);
135+
i += 1;
136+
}
137+
138+
// Append the 20-byte data
139+
full_address_key.append(key);
140+
141+
// log(full_address_key.clone());
142+
143+
let key: b256 = b256::from_be_bytes(full_address_key.clone());
144+
145+
119146
new_guardian_set.keys.push(key.rsh(96));
120147
index += 20;
121148
i += 1;
122149
}
150+
151+
log("finished key extraction");
152+
123153
require(
124154
new_guardian_set
125155
.keys
126156
.len() == guardian_length.as_u64(),
127157
WormholeError::GuardianSetKeysLengthNotEqual,
128158
);
159+
log("Guardian set keys length check passed");
129160
require(
130161
encoded_upgrade
131162
.len() == index,
132163
WormholeError::InvalidGuardianSetUpgradeLength,
133164
);
165+
log("Guardian set upgrade length check passed");
134166
GuardianSetUpgrade::new(
135167
action,
136168
chain,

target_chains/fuel/contracts/tests/utils/interface/wormhole_guardians.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ pub(crate) async fn submit_new_guardian_set(
5959
contract: &PythOracleContract<WalletUnlocked>,
6060
encoded_vm: Bytes,
6161
) -> CallResponse<()> {
62-
contract
62+
let result = contract
6363
.methods()
6464
.submit_new_guardian_set(encoded_vm)
6565
.call()
66-
.await
67-
.map_err(handle_error)
68-
.unwrap()
66+
.await;
67+
68+
result.map_err(handle_error).unwrap()
6969
}

0 commit comments

Comments
 (0)