Skip to content

Commit 0244708

Browse files
committed
chore(gateway-contracts): update inputs order in add copro
1 parent 54c4f47 commit 0244708

File tree

9 files changed

+124
-122
lines changed

9 files changed

+124
-122
lines changed

gateway-contracts/contracts/CoprocessorContexts.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ contract CoprocessorContexts is ICoprocessorContexts, Ownable2StepUpgradeable, U
180180
*/
181181
function addCoprocessorContext(
182182
uint256 featureSet,
183-
CoprocessorContextBlockPeriods calldata blockPeriods,
184-
Coprocessor[] calldata coprocessors
183+
Coprocessor[] calldata coprocessors,
184+
CoprocessorContextBlockPeriods calldata blockPeriods
185185
) external virtual onlyOwner {
186186
CoprocessorContextsStorage storage $ = _getCoprocessorContextsStorage();
187187
// This will revert if there is no active coprocessor context. Although this should never

gateway-contracts/contracts/interfaces/ICoprocessorContexts.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,13 @@ interface ICoprocessorContexts {
190190
/**
191191
* @notice Add a new coprocessor context.
192192
* @param featureSet The feature set.
193-
* @param blockPeriods The block periods.
194193
* @param coprocessors The set of coprocessors representing the coprocessor context.
194+
* @param blockPeriods The block periods.
195195
*/
196196
function addCoprocessorContext(
197197
uint256 featureSet,
198-
CoprocessorContextBlockPeriods calldata blockPeriods,
199-
Coprocessor[] calldata coprocessors
198+
Coprocessor[] calldata coprocessors,
199+
CoprocessorContextBlockPeriods calldata blockPeriods
200200
) external;
201201

202202
/**

gateway-contracts/contracts/mocks/CoprocessorContextsMock.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ contract CoprocessorContextsMock {
3535

3636
function addCoprocessorContext(
3737
uint256 featureSet,
38-
CoprocessorContextBlockPeriods calldata blockPeriods,
39-
Coprocessor[] calldata coprocessors
38+
Coprocessor[] calldata coprocessors,
39+
CoprocessorContextBlockPeriods calldata blockPeriods
4040
) external {
4141
CoprocessorContext memory activeCoprocessorContext;
4242
CoprocessorContext memory newCoprocessorContext;

gateway-contracts/rust_bindings/src/coprocessorcontexts.rs

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

gateway-contracts/rust_bindings/src/icoprocessorcontexts.rs

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ interface ICoprocessorContexts {
4141
event PreActivateCoprocessorContext(CoprocessorContext newCoprocessorContext, uint256 activationBlockNumber);
4242
event SuspendCoprocessorContext(uint256 contextId, uint256 deactivatedBlockNumber);
4343
44-
function addCoprocessorContext(uint256 featureSet, CoprocessorContextBlockPeriods memory blockPeriods, Coprocessor[] memory coprocessors) external;
44+
function addCoprocessorContext(uint256 featureSet, Coprocessor[] memory coprocessors, CoprocessorContextBlockPeriods memory blockPeriods) external;
4545
function checkIsCoprocessorSignerFromContext(uint256 contextId, address signerAddress) external view;
4646
function checkIsCoprocessorTxSenderFromContext(uint256 contextId, address txSenderAddress) external view;
4747
function compromiseCoprocessorContext(uint256 contextId) external;
@@ -77,23 +77,6 @@ interface ICoprocessorContexts {
7777
"type": "uint256",
7878
"internalType": "uint256"
7979
},
80-
{
81-
"name": "blockPeriods",
82-
"type": "tuple",
83-
"internalType": "struct CoprocessorContextBlockPeriods",
84-
"components": [
85-
{
86-
"name": "preActivationBlockPeriod",
87-
"type": "uint256",
88-
"internalType": "uint256"
89-
},
90-
{
91-
"name": "suspendedBlockPeriod",
92-
"type": "uint256",
93-
"internalType": "uint256"
94-
}
95-
]
96-
},
9780
{
9881
"name": "coprocessors",
9982
"type": "tuple[]",
@@ -120,6 +103,23 @@ interface ICoprocessorContexts {
120103
"internalType": "string"
121104
}
122105
]
106+
},
107+
{
108+
"name": "blockPeriods",
109+
"type": "tuple",
110+
"internalType": "struct CoprocessorContextBlockPeriods",
111+
"components": [
112+
{
113+
"name": "preActivationBlockPeriod",
114+
"type": "uint256",
115+
"internalType": "uint256"
116+
},
117+
{
118+
"name": "suspendedBlockPeriod",
119+
"type": "uint256",
120+
"internalType": "uint256"
121+
}
122+
]
123123
}
124124
],
125125
"outputs": [],
@@ -3580,23 +3580,23 @@ event SuspendCoprocessorContext(uint256 contextId, uint256 deactivatedBlockNumbe
35803580
};
35813581
#[derive(serde::Serialize, serde::Deserialize)]
35823582
#[derive(Default, Debug, PartialEq, Eq, Hash)]
3583-
/**Function with signature `addCoprocessorContext(uint256,(uint256,uint256),(string,address,address,string)[])` and selector `0xdea95998`.
3583+
/**Function with signature `addCoprocessorContext(uint256,(string,address,address,string)[],(uint256,uint256))` and selector `0x84cae187`.
35843584
```solidity
3585-
function addCoprocessorContext(uint256 featureSet, CoprocessorContextBlockPeriods memory blockPeriods, Coprocessor[] memory coprocessors) external;
3585+
function addCoprocessorContext(uint256 featureSet, Coprocessor[] memory coprocessors, CoprocessorContextBlockPeriods memory blockPeriods) external;
35863586
```*/
35873587
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
35883588
#[derive(Clone)]
35893589
pub struct addCoprocessorContextCall {
35903590
#[allow(missing_docs)]
35913591
pub featureSet: alloy::sol_types::private::primitives::aliases::U256,
35923592
#[allow(missing_docs)]
3593-
pub blockPeriods: <CoprocessorContextBlockPeriods as alloy::sol_types::SolType>::RustType,
3594-
#[allow(missing_docs)]
35953593
pub coprocessors: alloy::sol_types::private::Vec<
35963594
<Coprocessor as alloy::sol_types::SolType>::RustType,
35973595
>,
3596+
#[allow(missing_docs)]
3597+
pub blockPeriods: <CoprocessorContextBlockPeriods as alloy::sol_types::SolType>::RustType,
35983598
}
3599-
///Container type for the return parameters of the [`addCoprocessorContext(uint256,(uint256,uint256),(string,address,address,string)[])`](addCoprocessorContextCall) function.
3599+
///Container type for the return parameters of the [`addCoprocessorContext(uint256,(string,address,address,string)[],(uint256,uint256))`](addCoprocessorContextCall) function.
36003600
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
36013601
#[derive(Clone)]
36023602
pub struct addCoprocessorContextReturn {}
@@ -3612,16 +3612,16 @@ function addCoprocessorContext(uint256 featureSet, CoprocessorContextBlockPeriod
36123612
#[doc(hidden)]
36133613
type UnderlyingSolTuple<'a> = (
36143614
alloy::sol_types::sol_data::Uint<256>,
3615-
CoprocessorContextBlockPeriods,
36163615
alloy::sol_types::sol_data::Array<Coprocessor>,
3616+
CoprocessorContextBlockPeriods,
36173617
);
36183618
#[doc(hidden)]
36193619
type UnderlyingRustTuple<'a> = (
36203620
alloy::sol_types::private::primitives::aliases::U256,
3621-
<CoprocessorContextBlockPeriods as alloy::sol_types::SolType>::RustType,
36223621
alloy::sol_types::private::Vec<
36233622
<Coprocessor as alloy::sol_types::SolType>::RustType,
36243623
>,
3624+
<CoprocessorContextBlockPeriods as alloy::sol_types::SolType>::RustType,
36253625
);
36263626
#[cfg(test)]
36273627
#[allow(dead_code, unreachable_patterns)]
@@ -3639,7 +3639,7 @@ function addCoprocessorContext(uint256 featureSet, CoprocessorContextBlockPeriod
36393639
impl ::core::convert::From<addCoprocessorContextCall>
36403640
for UnderlyingRustTuple<'_> {
36413641
fn from(value: addCoprocessorContextCall) -> Self {
3642-
(value.featureSet, value.blockPeriods, value.coprocessors)
3642+
(value.featureSet, value.coprocessors, value.blockPeriods)
36433643
}
36443644
}
36453645
#[automatically_derived]
@@ -3649,8 +3649,8 @@ function addCoprocessorContext(uint256 featureSet, CoprocessorContextBlockPeriod
36493649
fn from(tuple: UnderlyingRustTuple<'_>) -> Self {
36503650
Self {
36513651
featureSet: tuple.0,
3652-
blockPeriods: tuple.1,
3653-
coprocessors: tuple.2,
3652+
coprocessors: tuple.1,
3653+
blockPeriods: tuple.2,
36543654
}
36553655
}
36563656
}
@@ -3692,8 +3692,8 @@ function addCoprocessorContext(uint256 featureSet, CoprocessorContextBlockPeriod
36923692
impl alloy_sol_types::SolCall for addCoprocessorContextCall {
36933693
type Parameters<'a> = (
36943694
alloy::sol_types::sol_data::Uint<256>,
3695-
CoprocessorContextBlockPeriods,
36963695
alloy::sol_types::sol_data::Array<Coprocessor>,
3696+
CoprocessorContextBlockPeriods,
36973697
);
36983698
type Token<'a> = <Self::Parameters<
36993699
'a,
@@ -3703,8 +3703,8 @@ function addCoprocessorContext(uint256 featureSet, CoprocessorContextBlockPeriod
37033703
type ReturnToken<'a> = <Self::ReturnTuple<
37043704
'a,
37053705
> as alloy_sol_types::SolType>::Token<'a>;
3706-
const SIGNATURE: &'static str = "addCoprocessorContext(uint256,(uint256,uint256),(string,address,address,string)[])";
3707-
const SELECTOR: [u8; 4] = [222u8, 169u8, 89u8, 152u8];
3706+
const SIGNATURE: &'static str = "addCoprocessorContext(uint256,(string,address,address,string)[],(uint256,uint256))";
3707+
const SELECTOR: [u8; 4] = [132u8, 202u8, 225u8, 135u8];
37083708
#[inline]
37093709
fn new<'a>(
37103710
tuple: <Self::Parameters<'a> as alloy_sol_types::SolType>::RustType,
@@ -3717,12 +3717,12 @@ function addCoprocessorContext(uint256 featureSet, CoprocessorContextBlockPeriod
37173717
<alloy::sol_types::sol_data::Uint<
37183718
256,
37193719
> as alloy_sol_types::SolType>::tokenize(&self.featureSet),
3720-
<CoprocessorContextBlockPeriods as alloy_sol_types::SolType>::tokenize(
3721-
&self.blockPeriods,
3722-
),
37233720
<alloy::sol_types::sol_data::Array<
37243721
Coprocessor,
37253722
> as alloy_sol_types::SolType>::tokenize(&self.coprocessors),
3723+
<CoprocessorContextBlockPeriods as alloy_sol_types::SolType>::tokenize(
3724+
&self.blockPeriods,
3725+
),
37263726
)
37273727
}
37283728
#[inline]
@@ -6497,6 +6497,7 @@ function refreshCoprocessorContextStatuses() external;
64976497
[96u8, 178u8, 84u8, 101u8],
64986498
[107u8, 168u8, 24u8, 225u8],
64996499
[113u8, 95u8, 8u8, 60u8],
6500+
[132u8, 202u8, 225u8, 135u8],
65006501
[136u8, 139u8, 153u8, 224u8],
65016502
[145u8, 100u8, 208u8, 174u8],
65026503
[149u8, 123u8, 42u8, 190u8],
@@ -6505,7 +6506,6 @@ function refreshCoprocessorContextStatuses() external;
65056506
[190u8, 145u8, 24u8, 123u8],
65066507
[209u8, 132u8, 29u8, 211u8],
65076508
[215u8, 64u8, 228u8, 2u8],
6508-
[222u8, 169u8, 89u8, 152u8],
65096509
[222u8, 191u8, 230u8, 92u8],
65106510
[238u8, 193u8, 104u8, 251u8],
65116511
[239u8, 105u8, 151u8, 249u8],
@@ -6706,6 +6706,19 @@ function refreshCoprocessorContextStatuses() external;
67066706
}
67076707
getCoprocessorContextDeactivatedBlockNumber
67086708
},
6709+
{
6710+
fn addCoprocessorContext(
6711+
data: &[u8],
6712+
validate: bool,
6713+
) -> alloy_sol_types::Result<ICoprocessorContextsCalls> {
6714+
<addCoprocessorContextCall as alloy_sol_types::SolCall>::abi_decode_raw(
6715+
data,
6716+
validate,
6717+
)
6718+
.map(ICoprocessorContextsCalls::addCoprocessorContext)
6719+
}
6720+
addCoprocessorContext
6721+
},
67096722
{
67106723
fn getCoprocessorContextStatus(
67116724
data: &[u8],
@@ -6818,19 +6831,6 @@ function refreshCoprocessorContextStatuses() external;
68186831
}
68196832
destroyCoprocessorContext
68206833
},
6821-
{
6822-
fn addCoprocessorContext(
6823-
data: &[u8],
6824-
validate: bool,
6825-
) -> alloy_sol_types::Result<ICoprocessorContextsCalls> {
6826-
<addCoprocessorContextCall as alloy_sol_types::SolCall>::abi_decode_raw(
6827-
data,
6828-
validate,
6829-
)
6830-
.map(ICoprocessorContextsCalls::addCoprocessorContext)
6831-
}
6832-
addCoprocessorContext
6833-
},
68346834
{
68356835
fn getCoprocessorContextActivationBlockNumber(
68366836
data: &[u8],
@@ -7939,16 +7939,16 @@ the bytecode concatenated with the constructor's ABI-encoded arguments.*/
79397939
pub fn addCoprocessorContext(
79407940
&self,
79417941
featureSet: alloy::sol_types::private::primitives::aliases::U256,
7942-
blockPeriods: <CoprocessorContextBlockPeriods as alloy::sol_types::SolType>::RustType,
79437942
coprocessors: alloy::sol_types::private::Vec<
79447943
<Coprocessor as alloy::sol_types::SolType>::RustType,
79457944
>,
7945+
blockPeriods: <CoprocessorContextBlockPeriods as alloy::sol_types::SolType>::RustType,
79467946
) -> alloy_contract::SolCallBuilder<T, &P, addCoprocessorContextCall, N> {
79477947
self.call_builder(
79487948
&addCoprocessorContextCall {
79497949
featureSet,
7950-
blockPeriods,
79517950
coprocessors,
7951+
blockPeriods,
79527952
},
79537953
)
79547954
}

0 commit comments

Comments
 (0)