Skip to content

Commit b273156

Browse files
MrishoLukambaMrishoLukamba
authored
Merge branch 'polytope-labs:main' into mhl-mmr
2 parents 27200b9 + d5ce126 commit b273156

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+707
-838
lines changed

‎.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
[submodule "evm/lib/forge-std"]
22
path = evm/lib/forge-std
33
url = git@github.com:foundry-rs/forge-std
4-
[submodule "evm/lib/ERC6160"]
5-
path = evm/lib/ERC6160
6-
url = https://github.com/polytope-labs/ERC6160
74
[submodule "evm/lib/solidity-stringutils"]
85
path = evm/lib/solidity-stringutils
96
url = https://github.com/Arachnid/solidity-stringutils

‎Cargo.lock

+5-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎evm/abi/src/generated/beefy.rs

+71-203
Large diffs are not rendered by default.

‎evm/abi/src/generated/erc20.rs

+2-2
Large diffs are not rendered by default.

‎evm/abi/src/generated/evm_host.rs

+9-80
Original file line numberDiff line numberDiff line change
@@ -1078,51 +1078,6 @@ pub mod evm_host {
10781078
},
10791079
],
10801080
),
1081-
(
1082-
::std::borrow::ToOwned::to_owned("setHostParamsAdmin"),
1083-
::std::vec![
1084-
::ethers::core::abi::ethabi::Function {
1085-
name: ::std::borrow::ToOwned::to_owned("setHostParamsAdmin"),
1086-
inputs: ::std::vec![
1087-
::ethers::core::abi::ethabi::Param {
1088-
name: ::std::borrow::ToOwned::to_owned("params"),
1089-
kind: ::ethers::core::abi::ethabi::ParamType::Tuple(
1090-
::std::vec![
1091-
::ethers::core::abi::ethabi::ParamType::Uint(256usize),
1092-
::ethers::core::abi::ethabi::ParamType::Uint(256usize),
1093-
::ethers::core::abi::ethabi::ParamType::Uint(256usize),
1094-
::ethers::core::abi::ethabi::ParamType::Address,
1095-
::ethers::core::abi::ethabi::ParamType::Address,
1096-
::ethers::core::abi::ethabi::ParamType::Address,
1097-
::ethers::core::abi::ethabi::ParamType::Address,
1098-
::ethers::core::abi::ethabi::ParamType::Address,
1099-
::ethers::core::abi::ethabi::ParamType::Uint(256usize),
1100-
::ethers::core::abi::ethabi::ParamType::Uint(256usize),
1101-
::ethers::core::abi::ethabi::ParamType::Address,
1102-
::ethers::core::abi::ethabi::ParamType::Array(
1103-
::std::boxed::Box::new(
1104-
::ethers::core::abi::ethabi::ParamType::Uint(256usize),
1105-
),
1106-
),
1107-
::ethers::core::abi::ethabi::ParamType::Array(
1108-
::std::boxed::Box::new(
1109-
::ethers::core::abi::ethabi::ParamType::Address,
1110-
),
1111-
),
1112-
::ethers::core::abi::ethabi::ParamType::Bytes,
1113-
],
1114-
),
1115-
internal_type: ::core::option::Option::Some(
1116-
::std::borrow::ToOwned::to_owned("struct HostParams"),
1117-
),
1118-
},
1119-
],
1120-
outputs: ::std::vec![],
1121-
constant: ::core::option::Option::None,
1122-
state_mutability: ::ethers::core::abi::ethabi::StateMutability::NonPayable,
1123-
},
1124-
],
1125-
),
11261081
(
11271082
::std::borrow::ToOwned::to_owned("stateCommitmentFee"),
11281083
::std::vec![
@@ -1584,6 +1539,13 @@ pub mod evm_host {
15841539
),
15851540
indexed: false,
15861541
},
1542+
::ethers::core::abi::ethabi::EventParam {
1543+
name: ::std::borrow::ToOwned::to_owned("fee"),
1544+
kind: ::ethers::core::abi::ethabi::ParamType::Uint(
1545+
256usize,
1546+
),
1547+
indexed: false,
1548+
},
15871549
],
15881550
anonymous: false,
15891551
},
@@ -2625,15 +2587,6 @@ pub mod evm_host {
26252587
.method_hash([106, 200, 139, 173], new_state)
26262588
.expect("method not found (this should never happen)")
26272589
}
2628-
///Calls the contract's `setHostParamsAdmin` (0x928af6d3) function
2629-
pub fn set_host_params_admin(
2630-
&self,
2631-
params: HostParams,
2632-
) -> ::ethers::contract::builders::ContractCall<M, ()> {
2633-
self.0
2634-
.method_hash([146, 138, 246, 211], (params,))
2635-
.expect("method not found (this should never happen)")
2636-
}
26372590
///Calls the contract's `stateCommitmentFee` (0xb5c8a08e) function
26382591
pub fn state_commitment_fee(
26392592
&self,
@@ -3448,7 +3401,7 @@ pub mod evm_host {
34483401
)]
34493402
#[ethevent(
34503403
name = "GetRequestEvent",
3451-
abi = "GetRequestEvent(string,string,address,bytes[],uint256,uint256,uint256)"
3404+
abi = "GetRequestEvent(string,string,address,bytes[],uint256,uint256,uint256,uint256)"
34523405
)]
34533406
pub struct GetRequestEventFilter {
34543407
pub source: ::std::string::String,
@@ -3459,6 +3412,7 @@ pub mod evm_host {
34593412
pub height: ::ethers::core::types::U256,
34603413
pub nonce: ::ethers::core::types::U256,
34613414
pub timeout_timestamp: ::ethers::core::types::U256,
3415+
pub fee: ::ethers::core::types::U256,
34623416
}
34633417
#[derive(
34643418
Clone,
@@ -4479,17 +4433,6 @@ pub mod evm_host {
44794433
pub struct SetFrozenStateCall {
44804434
pub new_state: u8,
44814435
}
4482-
///Container type for all input parameters for the `setHostParamsAdmin` function with signature
4483-
/// `setHostParamsAdmin((uint256,uint256,uint256,address,address,address,address,address,
4484-
/// uint256,uint256,address,uint256[],address[],bytes))` and selector `0x928af6d3`
4485-
#[derive(Clone, ::ethers::contract::EthCall, ::ethers::contract::EthDisplay)]
4486-
#[ethcall(
4487-
name = "setHostParamsAdmin",
4488-
abi = "setHostParamsAdmin((uint256,uint256,uint256,address,address,address,address,address,uint256,uint256,address,uint256[],address[],bytes))"
4489-
)]
4490-
pub struct SetHostParamsAdminCall {
4491-
pub params: HostParams,
4492-
}
44934436
///Container type for all input parameters for the `stateCommitmentFee` function with signature
44944437
/// `stateCommitmentFee()` and selector `0xb5c8a08e`
44954438
#[derive(
@@ -4732,7 +4675,6 @@ pub mod evm_host {
47324675
ResponseReceipts(ResponseReceiptsCall),
47334676
SetConsensusState(SetConsensusStateCall),
47344677
SetFrozenState(SetFrozenStateCall),
4735-
SetHostParamsAdmin(SetHostParamsAdminCall),
47364678
StateCommitmentFee(StateCommitmentFeeCall),
47374679
StateMachineCommitment(StateMachineCommitmentCall),
47384680
StateMachineCommitmentUpdateTime(StateMachineCommitmentUpdateTimeCall),
@@ -4892,11 +4834,6 @@ pub mod evm_host {
48924834
{
48934835
return Ok(Self::SetFrozenState(decoded));
48944836
}
4895-
if let Ok(decoded) =
4896-
<SetHostParamsAdminCall as ::ethers::core::abi::AbiDecode>::decode(data)
4897-
{
4898-
return Ok(Self::SetHostParamsAdmin(decoded));
4899-
}
49004837
if let Ok(decoded) =
49014838
<StateCommitmentFeeCall as ::ethers::core::abi::AbiDecode>::decode(data)
49024839
{
@@ -5003,8 +4940,6 @@ pub mod evm_host {
50034940
Self::ResponseReceipts(element) => ::ethers::core::abi::AbiEncode::encode(element),
50044941
Self::SetConsensusState(element) => ::ethers::core::abi::AbiEncode::encode(element),
50054942
Self::SetFrozenState(element) => ::ethers::core::abi::AbiEncode::encode(element),
5006-
Self::SetHostParamsAdmin(element) =>
5007-
::ethers::core::abi::AbiEncode::encode(element),
50084943
Self::StateCommitmentFee(element) =>
50094944
::ethers::core::abi::AbiEncode::encode(element),
50104945
Self::StateMachineCommitment(element) =>
@@ -5065,7 +5000,6 @@ pub mod evm_host {
50655000
Self::ResponseReceipts(element) => ::core::fmt::Display::fmt(element, f),
50665001
Self::SetConsensusState(element) => ::core::fmt::Display::fmt(element, f),
50675002
Self::SetFrozenState(element) => ::core::fmt::Display::fmt(element, f),
5068-
Self::SetHostParamsAdmin(element) => ::core::fmt::Display::fmt(element, f),
50695003
Self::StateCommitmentFee(element) => ::core::fmt::Display::fmt(element, f),
50705004
Self::StateMachineCommitment(element) => ::core::fmt::Display::fmt(element, f),
50715005
Self::StateMachineCommitmentUpdateTime(element) =>
@@ -5248,11 +5182,6 @@ pub mod evm_host {
52485182
Self::SetFrozenState(value)
52495183
}
52505184
}
5251-
impl ::core::convert::From<SetHostParamsAdminCall> for EvmHostCalls {
5252-
fn from(value: SetHostParamsAdminCall) -> Self {
5253-
Self::SetHostParamsAdmin(value)
5254-
}
5255-
}
52565185
impl ::core::convert::From<StateCommitmentFeeCall> for EvmHostCalls {
52575186
fn from(value: StateCommitmentFeeCall) -> Self {
52585187
Self::StateCommitmentFee(value)

0 commit comments

Comments
 (0)