From 256af175aab2f1ba41029934b7d65d10552d116a Mon Sep 17 00:00:00 2001 From: Guilherme Dantas Date: Tue, 30 May 2023 10:49:29 -0300 Subject: [PATCH 1/4] feat(contracts): add input relay interface and base contract --- .../rollups/contracts/inputs/IInputRelay.sol | 24 ++++++++++++++ .../rollups/contracts/inputs/InputRelay.sol | 33 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 onchain/rollups/contracts/inputs/IInputRelay.sol create mode 100644 onchain/rollups/contracts/inputs/InputRelay.sol diff --git a/onchain/rollups/contracts/inputs/IInputRelay.sol b/onchain/rollups/contracts/inputs/IInputRelay.sol new file mode 100644 index 00000000..15fc0571 --- /dev/null +++ b/onchain/rollups/contracts/inputs/IInputRelay.sol @@ -0,0 +1,24 @@ +// Copyright Cartesi Pte. Ltd. + +// SPDX-License-Identifier: Apache-2.0 +// Licensed under the Apache License, Version 2.0 (the "License"); you may not use +// this file except in compliance with the License. You may obtain a copy of the +// License at http://www.apache.org/licenses/LICENSE-2.0 + +// Unless required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +// CONDITIONS OF ANY KIND, either express or implied. See the License for the +// specific language governing permissions and limitations under the License. + +pragma solidity ^0.8.8; + +import {IInputBox} from "./IInputBox.sol"; + +/// @title Input Relay interface +interface IInputRelay { + // Permissionless functions + + /// @notice Get the input box used by this input relay. + /// @return The input box + function getInputBox() external view returns (IInputBox); +} diff --git a/onchain/rollups/contracts/inputs/InputRelay.sol b/onchain/rollups/contracts/inputs/InputRelay.sol new file mode 100644 index 00000000..501407c4 --- /dev/null +++ b/onchain/rollups/contracts/inputs/InputRelay.sol @@ -0,0 +1,33 @@ +// Copyright Cartesi Pte. Ltd. + +// SPDX-License-Identifier: Apache-2.0 +// Licensed under the Apache License, Version 2.0 (the "License"); you may not use +// this file except in compliance with the License. You may obtain a copy of the +// License at http://www.apache.org/licenses/LICENSE-2.0 + +// Unless required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +// CONDITIONS OF ANY KIND, either express or implied. See the License for the +// specific language governing permissions and limitations under the License. + +pragma solidity ^0.8.8; + +import {IInputRelay} from "./IInputRelay.sol"; +import {IInputBox} from "./IInputBox.sol"; + +/// @title Input Relay +/// @notice This contract serves as a base for all the other input relays. +contract InputRelay is IInputRelay { + /// @notice The input box used by the input relay. + IInputBox internal immutable inputBox; + + /// @notice Constructs the input relay. + /// @param _inputBox The input box used by the input relay + constructor(IInputBox _inputBox) { + inputBox = _inputBox; + } + + function getInputBox() external view override returns (IInputBox) { + return inputBox; + } +} From 9d82c288ba9a71c451fcae8f8df6b18e0a001fe4 Mon Sep 17 00:00:00 2001 From: Guilherme Dantas Date: Tue, 30 May 2023 11:13:55 -0300 Subject: [PATCH 2/4] refactor(contracts): make portals and relays inherit "input relay" * Make portals and relays inherit `InputRelay` * Make portals and relays interfaces inherit `IInputRelay` --- onchain/rollups/contracts/portals/ERC1155BatchPortal.sol | 6 +++--- onchain/rollups/contracts/portals/ERC1155SinglePortal.sol | 6 +++--- onchain/rollups/contracts/portals/ERC20Portal.sol | 6 +++--- onchain/rollups/contracts/portals/ERC721Portal.sol | 6 +++--- onchain/rollups/contracts/portals/EtherPortal.sol | 6 +++--- onchain/rollups/contracts/portals/IERC1155BatchPortal.sol | 4 ++-- onchain/rollups/contracts/portals/IERC1155SinglePortal.sol | 4 ++-- onchain/rollups/contracts/portals/IERC20Portal.sol | 4 ++-- onchain/rollups/contracts/portals/IERC721Portal.sol | 4 ++-- onchain/rollups/contracts/portals/IEtherPortal.sol | 4 ++-- onchain/rollups/contracts/relays/DAppAddressRelay.sol | 6 +++--- onchain/rollups/contracts/relays/IDAppAddressRelay.sol | 4 ++-- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/onchain/rollups/contracts/portals/ERC1155BatchPortal.sol b/onchain/rollups/contracts/portals/ERC1155BatchPortal.sol index e2b1228a..769420db 100644 --- a/onchain/rollups/contracts/portals/ERC1155BatchPortal.sol +++ b/onchain/rollups/contracts/portals/ERC1155BatchPortal.sol @@ -15,7 +15,7 @@ pragma solidity ^0.8.8; import {IERC1155} from "@openzeppelin/contracts/token/ERC1155/IERC1155.sol"; import {IERC1155BatchPortal} from "./IERC1155BatchPortal.sol"; -import {Portal} from "./Portal.sol"; +import {InputRelay} from "../inputs/InputRelay.sol"; import {IInputBox} from "../inputs/IInputBox.sol"; import {InputEncoding} from "../common/InputEncoding.sol"; @@ -23,10 +23,10 @@ import {InputEncoding} from "../common/InputEncoding.sol"; /// /// @notice This contract allows anyone to perform batch transfers of /// ERC-1155 tokens to a DApp while informing the off-chain machine. -contract ERC1155BatchPortal is Portal, IERC1155BatchPortal { +contract ERC1155BatchPortal is InputRelay, IERC1155BatchPortal { /// @notice Constructs the portal. /// @param _inputBox The input box used by the portal - constructor(IInputBox _inputBox) Portal(_inputBox) {} + constructor(IInputBox _inputBox) InputRelay(_inputBox) {} function depositBatchERC1155Token( IERC1155 _token, diff --git a/onchain/rollups/contracts/portals/ERC1155SinglePortal.sol b/onchain/rollups/contracts/portals/ERC1155SinglePortal.sol index e1ad0849..20a1b9ef 100644 --- a/onchain/rollups/contracts/portals/ERC1155SinglePortal.sol +++ b/onchain/rollups/contracts/portals/ERC1155SinglePortal.sol @@ -15,7 +15,7 @@ pragma solidity ^0.8.8; import {IERC1155} from "@openzeppelin/contracts/token/ERC1155/IERC1155.sol"; import {IERC1155SinglePortal} from "./IERC1155SinglePortal.sol"; -import {Portal} from "./Portal.sol"; +import {InputRelay} from "../inputs/InputRelay.sol"; import {IInputBox} from "../inputs/IInputBox.sol"; import {InputEncoding} from "../common/InputEncoding.sol"; @@ -23,10 +23,10 @@ import {InputEncoding} from "../common/InputEncoding.sol"; /// /// @notice This contract allows anyone to perform single transfers of /// ERC-1155 tokens to a DApp while informing the off-chain machine. -contract ERC1155SinglePortal is Portal, IERC1155SinglePortal { +contract ERC1155SinglePortal is InputRelay, IERC1155SinglePortal { /// @notice Constructs the portal. /// @param _inputBox The input box used by the portal - constructor(IInputBox _inputBox) Portal(_inputBox) {} + constructor(IInputBox _inputBox) InputRelay(_inputBox) {} function depositSingleERC1155Token( IERC1155 _token, diff --git a/onchain/rollups/contracts/portals/ERC20Portal.sol b/onchain/rollups/contracts/portals/ERC20Portal.sol index 06aad16f..42433805 100644 --- a/onchain/rollups/contracts/portals/ERC20Portal.sol +++ b/onchain/rollups/contracts/portals/ERC20Portal.sol @@ -15,7 +15,7 @@ pragma solidity ^0.8.8; import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import {IERC20Portal} from "./IERC20Portal.sol"; -import {Portal} from "./Portal.sol"; +import {InputRelay} from "../inputs/InputRelay.sol"; import {IInputBox} from "../inputs/IInputBox.sol"; import {InputEncoding} from "../common/InputEncoding.sol"; @@ -23,10 +23,10 @@ import {InputEncoding} from "../common/InputEncoding.sol"; /// /// @notice This contract allows anyone to perform transfers of /// ERC-20 tokens to a DApp while informing the off-chain machine. -contract ERC20Portal is Portal, IERC20Portal { +contract ERC20Portal is InputRelay, IERC20Portal { /// @notice Constructs the portal. /// @param _inputBox The input box used by the portal - constructor(IInputBox _inputBox) Portal(_inputBox) {} + constructor(IInputBox _inputBox) InputRelay(_inputBox) {} function depositERC20Tokens( IERC20 _token, diff --git a/onchain/rollups/contracts/portals/ERC721Portal.sol b/onchain/rollups/contracts/portals/ERC721Portal.sol index faaf7bd2..252a11de 100644 --- a/onchain/rollups/contracts/portals/ERC721Portal.sol +++ b/onchain/rollups/contracts/portals/ERC721Portal.sol @@ -15,7 +15,7 @@ pragma solidity ^0.8.8; import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol"; import {IERC721Portal} from "./IERC721Portal.sol"; -import {Portal} from "./Portal.sol"; +import {InputRelay} from "../inputs/InputRelay.sol"; import {IInputBox} from "../inputs/IInputBox.sol"; import {InputEncoding} from "../common/InputEncoding.sol"; @@ -23,10 +23,10 @@ import {InputEncoding} from "../common/InputEncoding.sol"; /// /// @notice This contract allows anyone to perform transfers of /// ERC-721 tokens to a DApp while informing the off-chain machine. -contract ERC721Portal is Portal, IERC721Portal { +contract ERC721Portal is InputRelay, IERC721Portal { /// @notice Constructs the portal. /// @param _inputBox The input box used by the portal - constructor(IInputBox _inputBox) Portal(_inputBox) {} + constructor(IInputBox _inputBox) InputRelay(_inputBox) {} function depositERC721Token( IERC721 _token, diff --git a/onchain/rollups/contracts/portals/EtherPortal.sol b/onchain/rollups/contracts/portals/EtherPortal.sol index a3413874..0b9a549e 100644 --- a/onchain/rollups/contracts/portals/EtherPortal.sol +++ b/onchain/rollups/contracts/portals/EtherPortal.sol @@ -13,7 +13,7 @@ pragma solidity ^0.8.8; import {IEtherPortal} from "./IEtherPortal.sol"; -import {Portal} from "./Portal.sol"; +import {InputRelay} from "../inputs/InputRelay.sol"; import {IInputBox} from "../inputs/IInputBox.sol"; import {InputEncoding} from "../common/InputEncoding.sol"; @@ -21,13 +21,13 @@ import {InputEncoding} from "../common/InputEncoding.sol"; /// /// @notice This contract allows anyone to perform transfers of /// Ether to a DApp while informing the off-chain machine. -contract EtherPortal is Portal, IEtherPortal { +contract EtherPortal is InputRelay, IEtherPortal { /// @notice Raised when the Ether transfer fails. error EtherTransferFailed(); /// @notice Constructs the portal. /// @param _inputBox The input box used by the portal - constructor(IInputBox _inputBox) Portal(_inputBox) {} + constructor(IInputBox _inputBox) InputRelay(_inputBox) {} function depositEther( address _dapp, diff --git a/onchain/rollups/contracts/portals/IERC1155BatchPortal.sol b/onchain/rollups/contracts/portals/IERC1155BatchPortal.sol index 7915d42b..28e51c79 100644 --- a/onchain/rollups/contracts/portals/IERC1155BatchPortal.sol +++ b/onchain/rollups/contracts/portals/IERC1155BatchPortal.sol @@ -12,11 +12,11 @@ pragma solidity ^0.8.8; -import {IPortal} from "./IPortal.sol"; +import {IInputRelay} from "../inputs/IInputRelay.sol"; import {IERC1155} from "@openzeppelin/contracts/token/ERC1155/IERC1155.sol"; /// @title ERC-1155 Batch Transfer Portal interface -interface IERC1155BatchPortal is IPortal { +interface IERC1155BatchPortal is IInputRelay { // Permissionless functions /// @notice Transfer a batch of ERC-1155 tokens to a DApp and add an input to diff --git a/onchain/rollups/contracts/portals/IERC1155SinglePortal.sol b/onchain/rollups/contracts/portals/IERC1155SinglePortal.sol index 138fcebe..93ef218e 100644 --- a/onchain/rollups/contracts/portals/IERC1155SinglePortal.sol +++ b/onchain/rollups/contracts/portals/IERC1155SinglePortal.sol @@ -12,11 +12,11 @@ pragma solidity ^0.8.8; -import {IPortal} from "./IPortal.sol"; +import {IInputRelay} from "../inputs/IInputRelay.sol"; import {IERC1155} from "@openzeppelin/contracts/token/ERC1155/IERC1155.sol"; /// @title ERC-1155 Single Transfer Portal interface -interface IERC1155SinglePortal is IPortal { +interface IERC1155SinglePortal is IInputRelay { // Permissionless functions /// @notice Transfer an ERC-1155 token to a DApp and add an input to diff --git a/onchain/rollups/contracts/portals/IERC20Portal.sol b/onchain/rollups/contracts/portals/IERC20Portal.sol index 3eefc321..5e0bbbaf 100644 --- a/onchain/rollups/contracts/portals/IERC20Portal.sol +++ b/onchain/rollups/contracts/portals/IERC20Portal.sol @@ -12,11 +12,11 @@ pragma solidity ^0.8.8; -import {IPortal} from "./IPortal.sol"; +import {IInputRelay} from "../inputs/IInputRelay.sol"; import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; /// @title ERC-20 Portal interface -interface IERC20Portal is IPortal { +interface IERC20Portal is IInputRelay { // Permissionless functions /// @notice Transfer ERC-20 tokens to a DApp and add an input to diff --git a/onchain/rollups/contracts/portals/IERC721Portal.sol b/onchain/rollups/contracts/portals/IERC721Portal.sol index b50eedf5..90feb8fd 100644 --- a/onchain/rollups/contracts/portals/IERC721Portal.sol +++ b/onchain/rollups/contracts/portals/IERC721Portal.sol @@ -12,11 +12,11 @@ pragma solidity ^0.8.8; -import {IPortal} from "./IPortal.sol"; +import {IInputRelay} from "../inputs/IInputRelay.sol"; import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol"; /// @title ERC-721 Portal interface -interface IERC721Portal is IPortal { +interface IERC721Portal is IInputRelay { // Permissionless functions /// @notice Transfer an ERC-721 token to a DApp and add an input to diff --git a/onchain/rollups/contracts/portals/IEtherPortal.sol b/onchain/rollups/contracts/portals/IEtherPortal.sol index 102919a7..dcc7766d 100644 --- a/onchain/rollups/contracts/portals/IEtherPortal.sol +++ b/onchain/rollups/contracts/portals/IEtherPortal.sol @@ -12,10 +12,10 @@ pragma solidity ^0.8.8; -import {IPortal} from "./IPortal.sol"; +import {IInputRelay} from "../inputs/IInputRelay.sol"; /// @title Ether Portal interface -interface IEtherPortal is IPortal { +interface IEtherPortal is IInputRelay { // Permissionless functions /// @notice Transfer Ether to a DApp and add an input to diff --git a/onchain/rollups/contracts/relays/DAppAddressRelay.sol b/onchain/rollups/contracts/relays/DAppAddressRelay.sol index 3cca3481..e6a9d534 100644 --- a/onchain/rollups/contracts/relays/DAppAddressRelay.sol +++ b/onchain/rollups/contracts/relays/DAppAddressRelay.sol @@ -13,7 +13,7 @@ pragma solidity ^0.8.8; import {IDAppAddressRelay} from "./IDAppAddressRelay.sol"; -import {Relay} from "./Relay.sol"; +import {InputRelay} from "../inputs/InputRelay.sol"; import {IInputBox} from "../inputs/IInputBox.sol"; import {InputEncoding} from "../common/InputEncoding.sol"; @@ -21,10 +21,10 @@ import {InputEncoding} from "../common/InputEncoding.sol"; /// /// @notice This contract allows anyone to inform the off-chain machine /// of the address of the DApp contract in a trustless and permissionless way. -contract DAppAddressRelay is Relay, IDAppAddressRelay { +contract DAppAddressRelay is InputRelay, IDAppAddressRelay { /// @notice Constructs the relay. /// @param _inputBox The input box used by the relay - constructor(IInputBox _inputBox) Relay(_inputBox) {} + constructor(IInputBox _inputBox) InputRelay(_inputBox) {} function relayDAppAddress(address _dapp) external override { bytes memory input = InputEncoding.encodeDAppAddressRelay(_dapp); diff --git a/onchain/rollups/contracts/relays/IDAppAddressRelay.sol b/onchain/rollups/contracts/relays/IDAppAddressRelay.sol index 661f616b..521aef6a 100644 --- a/onchain/rollups/contracts/relays/IDAppAddressRelay.sol +++ b/onchain/rollups/contracts/relays/IDAppAddressRelay.sol @@ -12,10 +12,10 @@ pragma solidity ^0.8.8; -import {IRelay} from "./IRelay.sol"; +import {IInputRelay} from "../inputs/IInputRelay.sol"; /// @title DApp Address Relay interface -interface IDAppAddressRelay is IRelay { +interface IDAppAddressRelay is IInputRelay { // Permissionless functions /// @notice Add an input to a DApp's input box with its address. From d0b6347b9c87eab01295968c58f296f093438247 Mon Sep 17 00:00:00 2001 From: Guilherme Dantas Date: Tue, 30 May 2023 11:20:50 -0300 Subject: [PATCH 3/4] refactor(contracts)!: remove base portal and relay contracts/ifaces --- onchain/rollups/contracts/portals/IPortal.sol | 24 -------------- onchain/rollups/contracts/portals/Portal.sol | 33 ------------------- onchain/rollups/contracts/relays/IRelay.sol | 24 -------------- onchain/rollups/contracts/relays/Relay.sol | 33 ------------------- 4 files changed, 114 deletions(-) delete mode 100644 onchain/rollups/contracts/portals/IPortal.sol delete mode 100644 onchain/rollups/contracts/portals/Portal.sol delete mode 100644 onchain/rollups/contracts/relays/IRelay.sol delete mode 100644 onchain/rollups/contracts/relays/Relay.sol diff --git a/onchain/rollups/contracts/portals/IPortal.sol b/onchain/rollups/contracts/portals/IPortal.sol deleted file mode 100644 index 65614fbe..00000000 --- a/onchain/rollups/contracts/portals/IPortal.sol +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright Cartesi Pte. Ltd. - -// SPDX-License-Identifier: Apache-2.0 -// Licensed under the Apache License, Version 2.0 (the "License"); you may not use -// this file except in compliance with the License. You may obtain a copy of the -// License at http://www.apache.org/licenses/LICENSE-2.0 - -// Unless required by applicable law or agreed to in writing, software distributed -// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -// CONDITIONS OF ANY KIND, either express or implied. See the License for the -// specific language governing permissions and limitations under the License. - -pragma solidity ^0.8.8; - -import {IInputBox} from "../inputs/IInputBox.sol"; - -/// @title Portal interface -interface IPortal { - // Permissionless functions - - /// @notice Get the input box used by this portal. - /// @return The input box - function getInputBox() external view returns (IInputBox); -} diff --git a/onchain/rollups/contracts/portals/Portal.sol b/onchain/rollups/contracts/portals/Portal.sol deleted file mode 100644 index d214b399..00000000 --- a/onchain/rollups/contracts/portals/Portal.sol +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright Cartesi Pte. Ltd. - -// SPDX-License-Identifier: Apache-2.0 -// Licensed under the Apache License, Version 2.0 (the "License"); you may not use -// this file except in compliance with the License. You may obtain a copy of the -// License at http://www.apache.org/licenses/LICENSE-2.0 - -// Unless required by applicable law or agreed to in writing, software distributed -// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -// CONDITIONS OF ANY KIND, either express or implied. See the License for the -// specific language governing permissions and limitations under the License. - -pragma solidity ^0.8.8; - -import {IPortal} from "./IPortal.sol"; -import {IInputBox} from "../inputs/IInputBox.sol"; - -/// @title Portal -/// @notice This contract serves as a base for all the other portals. -contract Portal is IPortal { - /// @notice The input box used by the portal. - IInputBox internal immutable inputBox; - - /// @notice Constructs the portal. - /// @param _inputBox The input box used by the portal - constructor(IInputBox _inputBox) { - inputBox = _inputBox; - } - - function getInputBox() external view override returns (IInputBox) { - return inputBox; - } -} diff --git a/onchain/rollups/contracts/relays/IRelay.sol b/onchain/rollups/contracts/relays/IRelay.sol deleted file mode 100644 index 88808fb2..00000000 --- a/onchain/rollups/contracts/relays/IRelay.sol +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright Cartesi Pte. Ltd. - -// SPDX-License-Identifier: Apache-2.0 -// Licensed under the Apache License, Version 2.0 (the "License"); you may not use -// this file except in compliance with the License. You may obtain a copy of the -// License at http://www.apache.org/licenses/LICENSE-2.0 - -// Unless required by applicable law or agreed to in writing, software distributed -// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -// CONDITIONS OF ANY KIND, either express or implied. See the License for the -// specific language governing permissions and limitations under the License. - -pragma solidity ^0.8.8; - -import {IInputBox} from "../inputs/IInputBox.sol"; - -/// @title Relay interface -interface IRelay { - // Permissionless functions - - /// @notice Get the input box used by this relay. - /// @return The input box - function getInputBox() external view returns (IInputBox); -} diff --git a/onchain/rollups/contracts/relays/Relay.sol b/onchain/rollups/contracts/relays/Relay.sol deleted file mode 100644 index 7129b309..00000000 --- a/onchain/rollups/contracts/relays/Relay.sol +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright Cartesi Pte. Ltd. - -// SPDX-License-Identifier: Apache-2.0 -// Licensed under the Apache License, Version 2.0 (the "License"); you may not use -// this file except in compliance with the License. You may obtain a copy of the -// License at http://www.apache.org/licenses/LICENSE-2.0 - -// Unless required by applicable law or agreed to in writing, software distributed -// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -// CONDITIONS OF ANY KIND, either express or implied. See the License for the -// specific language governing permissions and limitations under the License. - -pragma solidity ^0.8.8; - -import {IRelay} from "./IRelay.sol"; -import {IInputBox} from "../inputs/IInputBox.sol"; - -/// @title Relay -/// @notice This contract serves as a base for all the other relays. -contract Relay is IRelay { - /// @notice The input box used by the relay. - IInputBox internal immutable inputBox; - - /// @notice Constructs the relay. - /// @param _inputBox The input box used by the relay - constructor(IInputBox _inputBox) { - inputBox = _inputBox; - } - - function getInputBox() external view override returns (IInputBox) { - return inputBox; - } -} From b747ccca93c6cfd86b1d8a09d5fa3aa7598e38f1 Mon Sep 17 00:00:00 2001 From: Guilherme Dantas Date: Fri, 30 Jun 2023 21:33:52 -0300 Subject: [PATCH 4/4] chore(contracts): prepack --- .../IInputRelay.sol/IInputRelay.json} | 0 .../InputRelay.sol/InputRelay.json} | 0 .../contracts/relays/IRelay.sol/IRelay.json | 15 ---- .../abi/contracts/relays/Relay.sol/Relay.json | 26 ------ .../IInputRelay.sol/IInputRelay.json} | 8 +- .../InputRelay.sol/InputRelay.json} | 18 ++--- .../ERC1155BatchPortal.json | 6 +- .../ERC1155SinglePortal.json | 6 +- .../portals/ERC20Portal.sol/ERC20Portal.json | 6 +- .../ERC721Portal.sol/ERC721Portal.json | 6 +- .../portals/EtherPortal.sol/EtherPortal.json | 6 +- .../IERC1155BatchPortal.json | 2 +- .../IERC1155SinglePortal.json | 2 +- .../IERC20Portal.sol/IERC20Portal.json | 2 +- .../IERC721Portal.sol/IERC721Portal.json | 2 +- .../IEtherPortal.sol/IEtherPortal.json | 2 +- .../portals/IPortal.sol/IPortal.json | 50 ------------ .../contracts/portals/Portal.sol/Portal.json | 79 ------------------- .../DAppAddressRelay.json | 6 +- .../IDAppAddressRelay.json | 2 +- 20 files changed, 37 insertions(+), 207 deletions(-) rename onchain/rollups/abi/contracts/{portals/IPortal.sol/IPortal.json => inputs/IInputRelay.sol/IInputRelay.json} (100%) rename onchain/rollups/abi/contracts/{portals/Portal.sol/Portal.json => inputs/InputRelay.sol/InputRelay.json} (100%) delete mode 100644 onchain/rollups/abi/contracts/relays/IRelay.sol/IRelay.json delete mode 100644 onchain/rollups/abi/contracts/relays/Relay.sol/Relay.json rename onchain/rollups/export/artifacts/contracts/{relays/IRelay.sol/IRelay.json => inputs/IInputRelay.sol/IInputRelay.json} (80%) rename onchain/rollups/export/artifacts/contracts/{relays/Relay.sol/Relay.json => inputs/InputRelay.sol/InputRelay.json} (81%) delete mode 100644 onchain/rollups/export/artifacts/contracts/portals/IPortal.sol/IPortal.json delete mode 100644 onchain/rollups/export/artifacts/contracts/portals/Portal.sol/Portal.json diff --git a/onchain/rollups/abi/contracts/portals/IPortal.sol/IPortal.json b/onchain/rollups/abi/contracts/inputs/IInputRelay.sol/IInputRelay.json similarity index 100% rename from onchain/rollups/abi/contracts/portals/IPortal.sol/IPortal.json rename to onchain/rollups/abi/contracts/inputs/IInputRelay.sol/IInputRelay.json diff --git a/onchain/rollups/abi/contracts/portals/Portal.sol/Portal.json b/onchain/rollups/abi/contracts/inputs/InputRelay.sol/InputRelay.json similarity index 100% rename from onchain/rollups/abi/contracts/portals/Portal.sol/Portal.json rename to onchain/rollups/abi/contracts/inputs/InputRelay.sol/InputRelay.json diff --git a/onchain/rollups/abi/contracts/relays/IRelay.sol/IRelay.json b/onchain/rollups/abi/contracts/relays/IRelay.sol/IRelay.json deleted file mode 100644 index 3a471d20..00000000 --- a/onchain/rollups/abi/contracts/relays/IRelay.sol/IRelay.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - { - "inputs": [], - "name": "getInputBox", - "outputs": [ - { - "internalType": "contract IInputBox", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - } -] diff --git a/onchain/rollups/abi/contracts/relays/Relay.sol/Relay.json b/onchain/rollups/abi/contracts/relays/Relay.sol/Relay.json deleted file mode 100644 index 782021e4..00000000 --- a/onchain/rollups/abi/contracts/relays/Relay.sol/Relay.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "inputs": [ - { - "internalType": "contract IInputBox", - "name": "_inputBox", - "type": "address" - } - ], - "stateMutability": "nonpayable", - "type": "constructor" - }, - { - "inputs": [], - "name": "getInputBox", - "outputs": [ - { - "internalType": "contract IInputBox", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - } -] diff --git a/onchain/rollups/export/artifacts/contracts/relays/IRelay.sol/IRelay.json b/onchain/rollups/export/artifacts/contracts/inputs/IInputRelay.sol/IInputRelay.json similarity index 80% rename from onchain/rollups/export/artifacts/contracts/relays/IRelay.sol/IRelay.json rename to onchain/rollups/export/artifacts/contracts/inputs/IInputRelay.sol/IInputRelay.json index e1beade0..837fd45c 100644 --- a/onchain/rollups/export/artifacts/contracts/relays/IRelay.sol/IRelay.json +++ b/onchain/rollups/export/artifacts/contracts/inputs/IInputRelay.sol/IInputRelay.json @@ -1,6 +1,6 @@ { - "contractName": "IRelay", - "sourceName": "contracts/relays/IRelay.sol", + "contractName": "IInputRelay", + "sourceName": "contracts/inputs/IInputRelay.sol", "abi": [ { "inputs": [], @@ -29,14 +29,14 @@ } } }, - "title": "Relay interface", + "title": "Input Relay interface", "version": 1 }, "userdoc": { "kind": "user", "methods": { "getInputBox()": { - "notice": "Get the input box used by this relay." + "notice": "Get the input box used by this input relay." } }, "version": 1 diff --git a/onchain/rollups/export/artifacts/contracts/relays/Relay.sol/Relay.json b/onchain/rollups/export/artifacts/contracts/inputs/InputRelay.sol/InputRelay.json similarity index 81% rename from onchain/rollups/export/artifacts/contracts/relays/Relay.sol/Relay.json rename to onchain/rollups/export/artifacts/contracts/inputs/InputRelay.sol/InputRelay.json index fea22b8a..24aa940c 100644 --- a/onchain/rollups/export/artifacts/contracts/relays/Relay.sol/Relay.json +++ b/onchain/rollups/export/artifacts/contracts/inputs/InputRelay.sol/InputRelay.json @@ -1,6 +1,6 @@ { - "contractName": "Relay", - "sourceName": "contracts/relays/Relay.sol", + "contractName": "InputRelay", + "sourceName": "contracts/inputs/InputRelay.sol", "abi": [ { "inputs": [ @@ -27,8 +27,8 @@ "type": "function" } ], - "bytecode": "0x60a060405234801561001057600080fd5b5060405161012738038061012783398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b608051609f6100886000396000602e0152609f6000f3fe6080604052348015600f57600080fd5b506004361060275760003560e01c8062aace9a14602c575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f3fea2646970667358221220798a4cdded0f0a95d2fcdce22ce2dc961832d333130df3063a8064c0d6f11a3664736f6c63430008130033", - "deployedBytecode": "0x6080604052348015600f57600080fd5b506004361060275760003560e01c8062aace9a14602c575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f3fea2646970667358221220798a4cdded0f0a95d2fcdce22ce2dc961832d333130df3063a8064c0d6f11a3664736f6c63430008130033", + "bytecode": "0x60a060405234801561001057600080fd5b5060405161012738038061012783398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b608051609f6100886000396000602e0152609f6000f3fe6080604052348015600f57600080fd5b506004361060275760003560e01c8062aace9a14602c575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f3fea264697066735822122027d3e8815006903848507896ca292c934fecb106d4757454c435b575d5df45a264736f6c63430008130033", + "deployedBytecode": "0x6080604052348015600f57600080fd5b506004361060275760003560e01c8062aace9a14602c575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f3fea264697066735822122027d3e8815006903848507896ca292c934fecb106d4757454c435b575d5df45a264736f6c63430008130033", "linkReferences": {}, "deployedLinkReferences": {}, "devdoc": { @@ -36,7 +36,7 @@ "methods": { "constructor": { "params": { - "_inputBox": "The input box used by the relay" + "_inputBox": "The input box used by the input relay" } }, "getInputBox()": { @@ -45,20 +45,20 @@ } } }, - "title": "Relay", + "title": "Input Relay", "version": 1 }, "userdoc": { "kind": "user", "methods": { "constructor": { - "notice": "Constructs the relay." + "notice": "Constructs the input relay." }, "getInputBox()": { - "notice": "Get the input box used by this relay." + "notice": "Get the input box used by this input relay." } }, - "notice": "This contract serves as a base for all the other relays.", + "notice": "This contract serves as a base for all the other input relays.", "version": 1 }, "evm": { diff --git a/onchain/rollups/export/artifacts/contracts/portals/ERC1155BatchPortal.sol/ERC1155BatchPortal.json b/onchain/rollups/export/artifacts/contracts/portals/ERC1155BatchPortal.sol/ERC1155BatchPortal.json index d230ccd8..0f5cbf21 100644 --- a/onchain/rollups/export/artifacts/contracts/portals/ERC1155BatchPortal.sol/ERC1155BatchPortal.json +++ b/onchain/rollups/export/artifacts/contracts/portals/ERC1155BatchPortal.sol/ERC1155BatchPortal.json @@ -65,8 +65,8 @@ "type": "function" } ], - "bytecode": "0x60a060405234801561001057600080fd5b5060405161064538038061064583398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b6080516105b461009160003960008181603c015261012601526105b46000f3fe608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a57806324d15c6714610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a6100853660046102c1565b61008c565b005b604051631759616b60e11b81526001600160a01b038b1690632eb2c2d6906100c69033908d908d908d908d908d908d908d90600401610404565b600060405180830381600087803b1580156100e057600080fd5b505af11580156100f4573d6000803e3d6000fd5b50505050600061010c8b338b8b8b8b8b8b8b8b6101ae565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd639061015d908d90859060040161048c565b6020604051808303816000875af115801561017c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101a091906104ce565b505050505050505050505050565b6060600089898989898989896040516020016101d19897969594939291906104e7565b60405160208183030381529060405290508b8b826040516020016101f793929190610538565b6040516020818303038152906040529150509a9950505050505050505050565b80356001600160a01b038116811461022e57600080fd5b919050565b60008083601f84011261024557600080fd5b50813567ffffffffffffffff81111561025d57600080fd5b6020830191508360208260051b850101111561027857600080fd5b9250929050565b60008083601f84011261029157600080fd5b50813567ffffffffffffffff8111156102a957600080fd5b60208301915083602082850101111561027857600080fd5b60008060008060008060008060008060c08b8d0312156102e057600080fd5b6102e98b610217565b99506102f760208c01610217565b985060408b013567ffffffffffffffff8082111561031457600080fd5b6103208e838f01610233565b909a50985060608d013591508082111561033957600080fd5b6103458e838f01610233565b909850965060808d013591508082111561035e57600080fd5b61036a8e838f0161027f565b909650945060a08d013591508082111561038357600080fd5b506103908d828e0161027f565b915080935050809150509295989b9194979a5092959850565b81835260006001600160fb1b038311156103c257600080fd5b8260051b80836020870137939093016020019392505050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6001600160a01b0389811682528816602082015260a060408201819052600090610431908301888a6103a9565b82810360608401526104448187896103a9565b905082810360808401526104598185876103db565b9b9a5050505050505050505050565b60005b8381101561048357818101518382015260200161046b565b50506000910152565b60018060a01b038316815260406020820152600082518060408401526104b9816060850160208701610468565b601f01601f1916919091016060019392505050565b6000602082840312156104e057600080fd5b5051919050565b6080815260006104fb608083018a8c6103a9565b828103602084015261050e81898b6103a9565b905082810360408401526105238187896103db565b905082810360608401526104598185876103db565b60006bffffffffffffffffffffffff19808660601b168352808560601b16601484015250825161056f816028850160208701610468565b9190910160280194935050505056fea26469706673582212208f81d68261ab2244420be39e1eb1a4532993a15911eaf4d8da01452b2bfb865264736f6c63430008130033", - "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a57806324d15c6714610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a6100853660046102c1565b61008c565b005b604051631759616b60e11b81526001600160a01b038b1690632eb2c2d6906100c69033908d908d908d908d908d908d908d90600401610404565b600060405180830381600087803b1580156100e057600080fd5b505af11580156100f4573d6000803e3d6000fd5b50505050600061010c8b338b8b8b8b8b8b8b8b6101ae565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd639061015d908d90859060040161048c565b6020604051808303816000875af115801561017c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101a091906104ce565b505050505050505050505050565b6060600089898989898989896040516020016101d19897969594939291906104e7565b60405160208183030381529060405290508b8b826040516020016101f793929190610538565b6040516020818303038152906040529150509a9950505050505050505050565b80356001600160a01b038116811461022e57600080fd5b919050565b60008083601f84011261024557600080fd5b50813567ffffffffffffffff81111561025d57600080fd5b6020830191508360208260051b850101111561027857600080fd5b9250929050565b60008083601f84011261029157600080fd5b50813567ffffffffffffffff8111156102a957600080fd5b60208301915083602082850101111561027857600080fd5b60008060008060008060008060008060c08b8d0312156102e057600080fd5b6102e98b610217565b99506102f760208c01610217565b985060408b013567ffffffffffffffff8082111561031457600080fd5b6103208e838f01610233565b909a50985060608d013591508082111561033957600080fd5b6103458e838f01610233565b909850965060808d013591508082111561035e57600080fd5b61036a8e838f0161027f565b909650945060a08d013591508082111561038357600080fd5b506103908d828e0161027f565b915080935050809150509295989b9194979a5092959850565b81835260006001600160fb1b038311156103c257600080fd5b8260051b80836020870137939093016020019392505050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6001600160a01b0389811682528816602082015260a060408201819052600090610431908301888a6103a9565b82810360608401526104448187896103a9565b905082810360808401526104598185876103db565b9b9a5050505050505050505050565b60005b8381101561048357818101518382015260200161046b565b50506000910152565b60018060a01b038316815260406020820152600082518060408401526104b9816060850160208701610468565b601f01601f1916919091016060019392505050565b6000602082840312156104e057600080fd5b5051919050565b6080815260006104fb608083018a8c6103a9565b828103602084015261050e81898b6103a9565b905082810360408401526105238187896103db565b905082810360608401526104598185876103db565b60006bffffffffffffffffffffffff19808660601b168352808560601b16601484015250825161056f816028850160208701610468565b9190910160280194935050505056fea26469706673582212208f81d68261ab2244420be39e1eb1a4532993a15911eaf4d8da01452b2bfb865264736f6c63430008130033", + "bytecode": "0x60a060405234801561001057600080fd5b5060405161064538038061064583398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b6080516105b461009160003960008181603c015261012601526105b46000f3fe608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a57806324d15c6714610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a6100853660046102c1565b61008c565b005b604051631759616b60e11b81526001600160a01b038b1690632eb2c2d6906100c69033908d908d908d908d908d908d908d90600401610404565b600060405180830381600087803b1580156100e057600080fd5b505af11580156100f4573d6000803e3d6000fd5b50505050600061010c8b338b8b8b8b8b8b8b8b6101ae565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd639061015d908d90859060040161048c565b6020604051808303816000875af115801561017c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101a091906104ce565b505050505050505050505050565b6060600089898989898989896040516020016101d19897969594939291906104e7565b60405160208183030381529060405290508b8b826040516020016101f793929190610538565b6040516020818303038152906040529150509a9950505050505050505050565b80356001600160a01b038116811461022e57600080fd5b919050565b60008083601f84011261024557600080fd5b50813567ffffffffffffffff81111561025d57600080fd5b6020830191508360208260051b850101111561027857600080fd5b9250929050565b60008083601f84011261029157600080fd5b50813567ffffffffffffffff8111156102a957600080fd5b60208301915083602082850101111561027857600080fd5b60008060008060008060008060008060c08b8d0312156102e057600080fd5b6102e98b610217565b99506102f760208c01610217565b985060408b013567ffffffffffffffff8082111561031457600080fd5b6103208e838f01610233565b909a50985060608d013591508082111561033957600080fd5b6103458e838f01610233565b909850965060808d013591508082111561035e57600080fd5b61036a8e838f0161027f565b909650945060a08d013591508082111561038357600080fd5b506103908d828e0161027f565b915080935050809150509295989b9194979a5092959850565b81835260006001600160fb1b038311156103c257600080fd5b8260051b80836020870137939093016020019392505050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6001600160a01b0389811682528816602082015260a060408201819052600090610431908301888a6103a9565b82810360608401526104448187896103a9565b905082810360808401526104598185876103db565b9b9a5050505050505050505050565b60005b8381101561048357818101518382015260200161046b565b50506000910152565b60018060a01b038316815260406020820152600082518060408401526104b9816060850160208701610468565b601f01601f1916919091016060019392505050565b6000602082840312156104e057600080fd5b5051919050565b6080815260006104fb608083018a8c6103a9565b828103602084015261050e81898b6103a9565b905082810360408401526105238187896103db565b905082810360608401526104598185876103db565b60006bffffffffffffffffffffffff19808660601b168352808560601b16601484015250825161056f816028850160208701610468565b9190910160280194935050505056fea2646970667358221220c9c57340b796a6b584a1c7cd5626454bf644acddc137079f21699cf784a1063264736f6c63430008130033", + "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a57806324d15c6714610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a6100853660046102c1565b61008c565b005b604051631759616b60e11b81526001600160a01b038b1690632eb2c2d6906100c69033908d908d908d908d908d908d908d90600401610404565b600060405180830381600087803b1580156100e057600080fd5b505af11580156100f4573d6000803e3d6000fd5b50505050600061010c8b338b8b8b8b8b8b8b8b6101ae565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd639061015d908d90859060040161048c565b6020604051808303816000875af115801561017c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101a091906104ce565b505050505050505050505050565b6060600089898989898989896040516020016101d19897969594939291906104e7565b60405160208183030381529060405290508b8b826040516020016101f793929190610538565b6040516020818303038152906040529150509a9950505050505050505050565b80356001600160a01b038116811461022e57600080fd5b919050565b60008083601f84011261024557600080fd5b50813567ffffffffffffffff81111561025d57600080fd5b6020830191508360208260051b850101111561027857600080fd5b9250929050565b60008083601f84011261029157600080fd5b50813567ffffffffffffffff8111156102a957600080fd5b60208301915083602082850101111561027857600080fd5b60008060008060008060008060008060c08b8d0312156102e057600080fd5b6102e98b610217565b99506102f760208c01610217565b985060408b013567ffffffffffffffff8082111561031457600080fd5b6103208e838f01610233565b909a50985060608d013591508082111561033957600080fd5b6103458e838f01610233565b909850965060808d013591508082111561035e57600080fd5b61036a8e838f0161027f565b909650945060a08d013591508082111561038357600080fd5b506103908d828e0161027f565b915080935050809150509295989b9194979a5092959850565b81835260006001600160fb1b038311156103c257600080fd5b8260051b80836020870137939093016020019392505050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6001600160a01b0389811682528816602082015260a060408201819052600090610431908301888a6103a9565b82810360608401526104448187896103a9565b905082810360808401526104598185876103db565b9b9a5050505050505050505050565b60005b8381101561048357818101518382015260200161046b565b50506000910152565b60018060a01b038316815260406020820152600082518060408401526104b9816060850160208701610468565b601f01601f1916919091016060019392505050565b6000602082840312156104e057600080fd5b5051919050565b6080815260006104fb608083018a8c6103a9565b828103602084015261050e81898b6103a9565b905082810360408401526105238187896103db565b905082810360608401526104598185876103db565b60006bffffffffffffffffffffffff19808660601b168352808560601b16601484015250825161056f816028850160208701610468565b9190910160280194935050505056fea2646970667358221220c9c57340b796a6b584a1c7cd5626454bf644acddc137079f21699cf784a1063264736f6c63430008130033", "linkReferences": {}, "deployedLinkReferences": {}, "devdoc": { @@ -107,7 +107,7 @@ "notice": "Transfer a batch of ERC-1155 tokens to a DApp and add an input to the DApp's input box to signal such operation. The caller must enable approval for the portal to manage all of their tokens beforehand, by calling the `setApprovalForAll` function in the token contract." }, "getInputBox()": { - "notice": "Get the input box used by this portal." + "notice": "Get the input box used by this input relay." } }, "notice": "This contract allows anyone to perform batch transfers of ERC-1155 tokens to a DApp while informing the off-chain machine.", diff --git a/onchain/rollups/export/artifacts/contracts/portals/ERC1155SinglePortal.sol/ERC1155SinglePortal.json b/onchain/rollups/export/artifacts/contracts/portals/ERC1155SinglePortal.sol/ERC1155SinglePortal.json index 45060a2a..e2f452b2 100644 --- a/onchain/rollups/export/artifacts/contracts/portals/ERC1155SinglePortal.sol/ERC1155SinglePortal.json +++ b/onchain/rollups/export/artifacts/contracts/portals/ERC1155SinglePortal.sol/ERC1155SinglePortal.json @@ -65,8 +65,8 @@ "type": "function" } ], - "bytecode": "0x60a060405234801561001057600080fd5b5060405161054e38038061054e83398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b6080516104bd61009160003960008181603c015261012001526104bd6000f3fe608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a578063dec07dca14610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a61008536600461026a565b61008c565b005b604051637921219560e11b81526001600160a01b0389169063f242432a906100c29033908b908b908b908b908b9060040161033b565b600060405180830381600087803b1580156100dc57600080fd5b505af11580156100f0573d6000803e3d6000fd5b50505050600061010689338989898989896101a6565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd6390610157908b9085906004016103a6565b6020604051808303816000875af1158015610176573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019a91906103e8565b50505050505050505050565b60606000858585856040516020016101c19493929190610401565b604051602081830303815290604052905089898989846040516020016101eb959493929190610433565b60405160208183030381529060405291505098975050505050505050565b6001600160a01b038116811461021e57600080fd5b50565b60008083601f84011261023357600080fd5b50813567ffffffffffffffff81111561024b57600080fd5b60208301915083602082850101111561026357600080fd5b9250929050565b60008060008060008060008060c0898b03121561028657600080fd5b883561029181610209565b975060208901356102a181610209565b96506040890135955060608901359450608089013567ffffffffffffffff808211156102cc57600080fd5b6102d88c838d01610221565b909650945060a08b01359150808211156102f157600080fd5b506102fe8b828c01610221565b999c989b5096995094979396929594505050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6001600160a01b03878116825286166020820152604081018590526060810184905260a0608082018190526000906103769083018486610312565b98975050505050505050565b60005b8381101561039d578181015183820152602001610385565b50506000910152565b60018060a01b038316815260406020820152600082518060408401526103d3816060850160208701610382565b601f01601f1916919091016060019392505050565b6000602082840312156103fa57600080fd5b5051919050565b604081526000610415604083018688610312565b8281036020840152610428818587610312565b979650505050505050565b60006bffffffffffffffffffffffff19808860601b168352808760601b166014840152508460288301528360488301528251610476816068850160208701610382565b91909101606801969550505050505056fea2646970667358221220f9e0d378dd280a0f527219486c16abd7b77743944931afa4fb9427803682e1dd64736f6c63430008130033", - "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a578063dec07dca14610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a61008536600461026a565b61008c565b005b604051637921219560e11b81526001600160a01b0389169063f242432a906100c29033908b908b908b908b908b9060040161033b565b600060405180830381600087803b1580156100dc57600080fd5b505af11580156100f0573d6000803e3d6000fd5b50505050600061010689338989898989896101a6565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd6390610157908b9085906004016103a6565b6020604051808303816000875af1158015610176573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019a91906103e8565b50505050505050505050565b60606000858585856040516020016101c19493929190610401565b604051602081830303815290604052905089898989846040516020016101eb959493929190610433565b60405160208183030381529060405291505098975050505050505050565b6001600160a01b038116811461021e57600080fd5b50565b60008083601f84011261023357600080fd5b50813567ffffffffffffffff81111561024b57600080fd5b60208301915083602082850101111561026357600080fd5b9250929050565b60008060008060008060008060c0898b03121561028657600080fd5b883561029181610209565b975060208901356102a181610209565b96506040890135955060608901359450608089013567ffffffffffffffff808211156102cc57600080fd5b6102d88c838d01610221565b909650945060a08b01359150808211156102f157600080fd5b506102fe8b828c01610221565b999c989b5096995094979396929594505050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6001600160a01b03878116825286166020820152604081018590526060810184905260a0608082018190526000906103769083018486610312565b98975050505050505050565b60005b8381101561039d578181015183820152602001610385565b50506000910152565b60018060a01b038316815260406020820152600082518060408401526103d3816060850160208701610382565b601f01601f1916919091016060019392505050565b6000602082840312156103fa57600080fd5b5051919050565b604081526000610415604083018688610312565b8281036020840152610428818587610312565b979650505050505050565b60006bffffffffffffffffffffffff19808860601b168352808760601b166014840152508460288301528360488301528251610476816068850160208701610382565b91909101606801969550505050505056fea2646970667358221220f9e0d378dd280a0f527219486c16abd7b77743944931afa4fb9427803682e1dd64736f6c63430008130033", + "bytecode": "0x60a060405234801561001057600080fd5b5060405161054e38038061054e83398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b6080516104bd61009160003960008181603c015261012001526104bd6000f3fe608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a578063dec07dca14610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a61008536600461026a565b61008c565b005b604051637921219560e11b81526001600160a01b0389169063f242432a906100c29033908b908b908b908b908b9060040161033b565b600060405180830381600087803b1580156100dc57600080fd5b505af11580156100f0573d6000803e3d6000fd5b50505050600061010689338989898989896101a6565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd6390610157908b9085906004016103a6565b6020604051808303816000875af1158015610176573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019a91906103e8565b50505050505050505050565b60606000858585856040516020016101c19493929190610401565b604051602081830303815290604052905089898989846040516020016101eb959493929190610433565b60405160208183030381529060405291505098975050505050505050565b6001600160a01b038116811461021e57600080fd5b50565b60008083601f84011261023357600080fd5b50813567ffffffffffffffff81111561024b57600080fd5b60208301915083602082850101111561026357600080fd5b9250929050565b60008060008060008060008060c0898b03121561028657600080fd5b883561029181610209565b975060208901356102a181610209565b96506040890135955060608901359450608089013567ffffffffffffffff808211156102cc57600080fd5b6102d88c838d01610221565b909650945060a08b01359150808211156102f157600080fd5b506102fe8b828c01610221565b999c989b5096995094979396929594505050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6001600160a01b03878116825286166020820152604081018590526060810184905260a0608082018190526000906103769083018486610312565b98975050505050505050565b60005b8381101561039d578181015183820152602001610385565b50506000910152565b60018060a01b038316815260406020820152600082518060408401526103d3816060850160208701610382565b601f01601f1916919091016060019392505050565b6000602082840312156103fa57600080fd5b5051919050565b604081526000610415604083018688610312565b8281036020840152610428818587610312565b979650505050505050565b60006bffffffffffffffffffffffff19808860601b168352808760601b166014840152508460288301528360488301528251610476816068850160208701610382565b91909101606801969550505050505056fea264697066735822122084156a5ce8a5fbfc98de91ca955ed0d7ef43230ac3346ebdc0ccaccfb2f2ad7764736f6c63430008130033", + "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a578063dec07dca14610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a61008536600461026a565b61008c565b005b604051637921219560e11b81526001600160a01b0389169063f242432a906100c29033908b908b908b908b908b9060040161033b565b600060405180830381600087803b1580156100dc57600080fd5b505af11580156100f0573d6000803e3d6000fd5b50505050600061010689338989898989896101a6565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd6390610157908b9085906004016103a6565b6020604051808303816000875af1158015610176573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019a91906103e8565b50505050505050505050565b60606000858585856040516020016101c19493929190610401565b604051602081830303815290604052905089898989846040516020016101eb959493929190610433565b60405160208183030381529060405291505098975050505050505050565b6001600160a01b038116811461021e57600080fd5b50565b60008083601f84011261023357600080fd5b50813567ffffffffffffffff81111561024b57600080fd5b60208301915083602082850101111561026357600080fd5b9250929050565b60008060008060008060008060c0898b03121561028657600080fd5b883561029181610209565b975060208901356102a181610209565b96506040890135955060608901359450608089013567ffffffffffffffff808211156102cc57600080fd5b6102d88c838d01610221565b909650945060a08b01359150808211156102f157600080fd5b506102fe8b828c01610221565b999c989b5096995094979396929594505050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6001600160a01b03878116825286166020820152604081018590526060810184905260a0608082018190526000906103769083018486610312565b98975050505050505050565b60005b8381101561039d578181015183820152602001610385565b50506000910152565b60018060a01b038316815260406020820152600082518060408401526103d3816060850160208701610382565b601f01601f1916919091016060019392505050565b6000602082840312156103fa57600080fd5b5051919050565b604081526000610415604083018688610312565b8281036020840152610428818587610312565b979650505050505050565b60006bffffffffffffffffffffffff19808860601b168352808760601b166014840152508460288301528360488301528251610476816068850160208701610382565b91909101606801969550505050505056fea264697066735822122084156a5ce8a5fbfc98de91ca955ed0d7ef43230ac3346ebdc0ccaccfb2f2ad7764736f6c63430008130033", "linkReferences": {}, "deployedLinkReferences": {}, "devdoc": { @@ -106,7 +106,7 @@ "notice": "Transfer an ERC-1155 token to a DApp and add an input to the DApp's input box to signal such operation. The caller must enable approval for the portal to manage all of their tokens beforehand, by calling the `setApprovalForAll` function in the token contract." }, "getInputBox()": { - "notice": "Get the input box used by this portal." + "notice": "Get the input box used by this input relay." } }, "notice": "This contract allows anyone to perform single transfers of ERC-1155 tokens to a DApp while informing the off-chain machine.", diff --git a/onchain/rollups/export/artifacts/contracts/portals/ERC20Portal.sol/ERC20Portal.json b/onchain/rollups/export/artifacts/contracts/portals/ERC20Portal.sol/ERC20Portal.json index 7b5ef8e2..6421ee1e 100644 --- a/onchain/rollups/export/artifacts/contracts/portals/ERC20Portal.sol/ERC20Portal.json +++ b/onchain/rollups/export/artifacts/contracts/portals/ERC20Portal.sol/ERC20Portal.json @@ -55,8 +55,8 @@ "type": "function" } ], - "bytecode": "0x60a060405234801561001057600080fd5b5060405161045f38038061045f83398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b6080516103ce61009160003960008181603c015261013501526103ce6000f3fe608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a57806395854b8114610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a610085366004610209565b61008c565b005b6040516323b872dd60e01b81523360048201526001600160a01b03858116602483015260448201859052600091908716906323b872dd906064016020604051808303816000875af11580156100e5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061010991906102a8565b9050600061011b8288338888886101b9565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd639061016c90899085906004016102d1565b6020604051808303816000875af115801561018b573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101af919061032f565b5050505050505050565b60608686868686866040516020016101d696959493929190610348565b60405160208183030381529060405290509695505050505050565b6001600160a01b038116811461020657600080fd5b50565b60008060008060006080868803121561022157600080fd5b853561022c816101f1565b9450602086013561023c816101f1565b935060408601359250606086013567ffffffffffffffff8082111561026057600080fd5b818801915088601f83011261027457600080fd5b81358181111561028357600080fd5b89602082850101111561029557600080fd5b9699959850939650602001949392505050565b6000602082840312156102ba57600080fd5b815180151581146102ca57600080fd5b9392505050565b60018060a01b038316815260006020604081840152835180604085015260005b8181101561030d578581018301518582016060015282016102f1565b506000606082860101526060601f19601f830116850101925050509392505050565b60006020828403121561034157600080fd5b5051919050565b86151560f81b815260006bffffffffffffffffffffffff19808860601b166001840152808760601b166015840152508460298301528284604984013750600091016049019081529594505050505056fea264697066735822122033d42cef94bbbdceafaa2705c2b05dcbca144a7c1897a51307437a5741b9165a64736f6c63430008130033", - "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a57806395854b8114610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a610085366004610209565b61008c565b005b6040516323b872dd60e01b81523360048201526001600160a01b03858116602483015260448201859052600091908716906323b872dd906064016020604051808303816000875af11580156100e5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061010991906102a8565b9050600061011b8288338888886101b9565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd639061016c90899085906004016102d1565b6020604051808303816000875af115801561018b573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101af919061032f565b5050505050505050565b60608686868686866040516020016101d696959493929190610348565b60405160208183030381529060405290509695505050505050565b6001600160a01b038116811461020657600080fd5b50565b60008060008060006080868803121561022157600080fd5b853561022c816101f1565b9450602086013561023c816101f1565b935060408601359250606086013567ffffffffffffffff8082111561026057600080fd5b818801915088601f83011261027457600080fd5b81358181111561028357600080fd5b89602082850101111561029557600080fd5b9699959850939650602001949392505050565b6000602082840312156102ba57600080fd5b815180151581146102ca57600080fd5b9392505050565b60018060a01b038316815260006020604081840152835180604085015260005b8181101561030d578581018301518582016060015282016102f1565b506000606082860101526060601f19601f830116850101925050509392505050565b60006020828403121561034157600080fd5b5051919050565b86151560f81b815260006bffffffffffffffffffffffff19808860601b166001840152808760601b166015840152508460298301528284604984013750600091016049019081529594505050505056fea264697066735822122033d42cef94bbbdceafaa2705c2b05dcbca144a7c1897a51307437a5741b9165a64736f6c63430008130033", + "bytecode": "0x60a060405234801561001057600080fd5b5060405161045f38038061045f83398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b6080516103ce61009160003960008181603c015261013501526103ce6000f3fe608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a57806395854b8114610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a610085366004610209565b61008c565b005b6040516323b872dd60e01b81523360048201526001600160a01b03858116602483015260448201859052600091908716906323b872dd906064016020604051808303816000875af11580156100e5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061010991906102a8565b9050600061011b8288338888886101b9565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd639061016c90899085906004016102d1565b6020604051808303816000875af115801561018b573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101af919061032f565b5050505050505050565b60608686868686866040516020016101d696959493929190610348565b60405160208183030381529060405290509695505050505050565b6001600160a01b038116811461020657600080fd5b50565b60008060008060006080868803121561022157600080fd5b853561022c816101f1565b9450602086013561023c816101f1565b935060408601359250606086013567ffffffffffffffff8082111561026057600080fd5b818801915088601f83011261027457600080fd5b81358181111561028357600080fd5b89602082850101111561029557600080fd5b9699959850939650602001949392505050565b6000602082840312156102ba57600080fd5b815180151581146102ca57600080fd5b9392505050565b60018060a01b038316815260006020604081840152835180604085015260005b8181101561030d578581018301518582016060015282016102f1565b506000606082860101526060601f19601f830116850101925050509392505050565b60006020828403121561034157600080fd5b5051919050565b86151560f81b815260006bffffffffffffffffffffffff19808860601b166001840152808760601b166015840152508460298301528284604984013750600091016049019081529594505050505056fea264697066735822122082a0be87dd414c83ef057cb1487968a06d3777c5692f2d7e0da6d74cbc456ea864736f6c63430008130033", + "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a57806395854b8114610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a610085366004610209565b61008c565b005b6040516323b872dd60e01b81523360048201526001600160a01b03858116602483015260448201859052600091908716906323b872dd906064016020604051808303816000875af11580156100e5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061010991906102a8565b9050600061011b8288338888886101b9565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd639061016c90899085906004016102d1565b6020604051808303816000875af115801561018b573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101af919061032f565b5050505050505050565b60608686868686866040516020016101d696959493929190610348565b60405160208183030381529060405290509695505050505050565b6001600160a01b038116811461020657600080fd5b50565b60008060008060006080868803121561022157600080fd5b853561022c816101f1565b9450602086013561023c816101f1565b935060408601359250606086013567ffffffffffffffff8082111561026057600080fd5b818801915088601f83011261027457600080fd5b81358181111561028357600080fd5b89602082850101111561029557600080fd5b9699959850939650602001949392505050565b6000602082840312156102ba57600080fd5b815180151581146102ca57600080fd5b9392505050565b60018060a01b038316815260006020604081840152835180604085015260005b8181101561030d578581018301518582016060015282016102f1565b506000606082860101526060601f19601f830116850101925050509392505050565b60006020828403121561034157600080fd5b5051919050565b86151560f81b815260006bffffffffffffffffffffffff19808860601b166001840152808760601b166015840152508460298301528284604984013750600091016049019081529594505050505056fea264697066735822122082a0be87dd414c83ef057cb1487968a06d3777c5692f2d7e0da6d74cbc456ea864736f6c63430008130033", "linkReferences": {}, "deployedLinkReferences": {}, "devdoc": { @@ -94,7 +94,7 @@ "notice": "Transfer ERC-20 tokens to a DApp and add an input to the DApp's input box to signal such operation. The caller must allow the portal to withdraw at least `_amount` tokens from their account beforehand, by calling the `approve` function in the token contract." }, "getInputBox()": { - "notice": "Get the input box used by this portal." + "notice": "Get the input box used by this input relay." } }, "notice": "This contract allows anyone to perform transfers of ERC-20 tokens to a DApp while informing the off-chain machine.", diff --git a/onchain/rollups/export/artifacts/contracts/portals/ERC721Portal.sol/ERC721Portal.json b/onchain/rollups/export/artifacts/contracts/portals/ERC721Portal.sol/ERC721Portal.json index 713dfd6d..aae6fcdc 100644 --- a/onchain/rollups/export/artifacts/contracts/portals/ERC721Portal.sol/ERC721Portal.json +++ b/onchain/rollups/export/artifacts/contracts/portals/ERC721Portal.sol/ERC721Portal.json @@ -60,8 +60,8 @@ "type": "function" } ], - "bytecode": "0x60a060405234801561001057600080fd5b5060405161052438038061052483398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b60805161049361009160003960008181603c015261011d01526104936000f3fe608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a57806328911e8314610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a610085366004610263565b61008c565b005b604051635c46a7ef60e11b81526001600160a01b0388169063b88d4fde906100c09033908a908a908a908a9060040161032b565b600060405180830381600087803b1580156100da57600080fd5b505af11580156100ee573d6000803e3d6000fd5b505050506000610103883388888888886101a2565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd6390610154908a90859060040161038e565b6020604051808303816000875af1158015610173573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019791906103d0565b505050505050505050565b60606000858585856040516020016101bd94939291906103e9565b6040516020818303038152906040529050888888836040516020016101e59493929190610410565b604051602081830303815290604052915050979650505050505050565b6001600160a01b038116811461021757600080fd5b50565b60008083601f84011261022c57600080fd5b50813567ffffffffffffffff81111561024457600080fd5b60208301915083602082850101111561025c57600080fd5b9250929050565b600080600080600080600060a0888a03121561027e57600080fd5b873561028981610202565b9650602088013561029981610202565b955060408801359450606088013567ffffffffffffffff808211156102bd57600080fd5b6102c98b838c0161021a565b909650945060808a01359150808211156102e257600080fd5b506102ef8a828b0161021a565b989b979a50959850939692959293505050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6001600160a01b038681168252851660208201526040810184905260806060820181905260009061035f9083018486610302565b979650505050505050565b60005b8381101561038557818101518382015260200161036d565b50506000910152565b60018060a01b038316815260406020820152600082518060408401526103bb81606085016020870161036a565b601f01601f1916919091016060019392505050565b6000602082840312156103e257600080fd5b5051919050565b6040815260006103fd604083018688610302565b828103602084015261035f818587610302565b60006bffffffffffffffffffffffff19808760601b168352808660601b16601484015250836028830152825161044d81604885016020870161036a565b919091016048019594505050505056fea26469706673582212202328e7cd5e794150bf30b0049b3646dffe7efb708aad2038ad8e356bafd447c464736f6c63430008130033", - "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a57806328911e8314610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a610085366004610263565b61008c565b005b604051635c46a7ef60e11b81526001600160a01b0388169063b88d4fde906100c09033908a908a908a908a9060040161032b565b600060405180830381600087803b1580156100da57600080fd5b505af11580156100ee573d6000803e3d6000fd5b505050506000610103883388888888886101a2565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd6390610154908a90859060040161038e565b6020604051808303816000875af1158015610173573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019791906103d0565b505050505050505050565b60606000858585856040516020016101bd94939291906103e9565b6040516020818303038152906040529050888888836040516020016101e59493929190610410565b604051602081830303815290604052915050979650505050505050565b6001600160a01b038116811461021757600080fd5b50565b60008083601f84011261022c57600080fd5b50813567ffffffffffffffff81111561024457600080fd5b60208301915083602082850101111561025c57600080fd5b9250929050565b600080600080600080600060a0888a03121561027e57600080fd5b873561028981610202565b9650602088013561029981610202565b955060408801359450606088013567ffffffffffffffff808211156102bd57600080fd5b6102c98b838c0161021a565b909650945060808a01359150808211156102e257600080fd5b506102ef8a828b0161021a565b989b979a50959850939692959293505050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6001600160a01b038681168252851660208201526040810184905260806060820181905260009061035f9083018486610302565b979650505050505050565b60005b8381101561038557818101518382015260200161036d565b50506000910152565b60018060a01b038316815260406020820152600082518060408401526103bb81606085016020870161036a565b601f01601f1916919091016060019392505050565b6000602082840312156103e257600080fd5b5051919050565b6040815260006103fd604083018688610302565b828103602084015261035f818587610302565b60006bffffffffffffffffffffffff19808760601b168352808660601b16601484015250836028830152825161044d81604885016020870161036a565b919091016048019594505050505056fea26469706673582212202328e7cd5e794150bf30b0049b3646dffe7efb708aad2038ad8e356bafd447c464736f6c63430008130033", + "bytecode": "0x60a060405234801561001057600080fd5b5060405161052438038061052483398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b60805161049361009160003960008181603c015261011d01526104936000f3fe608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a57806328911e8314610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a610085366004610263565b61008c565b005b604051635c46a7ef60e11b81526001600160a01b0388169063b88d4fde906100c09033908a908a908a908a9060040161032b565b600060405180830381600087803b1580156100da57600080fd5b505af11580156100ee573d6000803e3d6000fd5b505050506000610103883388888888886101a2565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd6390610154908a90859060040161038e565b6020604051808303816000875af1158015610173573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019791906103d0565b505050505050505050565b60606000858585856040516020016101bd94939291906103e9565b6040516020818303038152906040529050888888836040516020016101e59493929190610410565b604051602081830303815290604052915050979650505050505050565b6001600160a01b038116811461021757600080fd5b50565b60008083601f84011261022c57600080fd5b50813567ffffffffffffffff81111561024457600080fd5b60208301915083602082850101111561025c57600080fd5b9250929050565b600080600080600080600060a0888a03121561027e57600080fd5b873561028981610202565b9650602088013561029981610202565b955060408801359450606088013567ffffffffffffffff808211156102bd57600080fd5b6102c98b838c0161021a565b909650945060808a01359150808211156102e257600080fd5b506102ef8a828b0161021a565b989b979a50959850939692959293505050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6001600160a01b038681168252851660208201526040810184905260806060820181905260009061035f9083018486610302565b979650505050505050565b60005b8381101561038557818101518382015260200161036d565b50506000910152565b60018060a01b038316815260406020820152600082518060408401526103bb81606085016020870161036a565b601f01601f1916919091016060019392505050565b6000602082840312156103e257600080fd5b5051919050565b6040815260006103fd604083018688610302565b828103602084015261035f818587610302565b60006bffffffffffffffffffffffff19808760601b168352808660601b16601484015250836028830152825161044d81604885016020870161036a565b919091016048019594505050505056fea2646970667358221220963d2a6a38e800c0a3ba04759b9e7c546f6e440dac437e91d4405ca2785c10ff64736f6c63430008130033", + "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a57806328911e8314610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a610085366004610263565b61008c565b005b604051635c46a7ef60e11b81526001600160a01b0388169063b88d4fde906100c09033908a908a908a908a9060040161032b565b600060405180830381600087803b1580156100da57600080fd5b505af11580156100ee573d6000803e3d6000fd5b505050506000610103883388888888886101a2565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd6390610154908a90859060040161038e565b6020604051808303816000875af1158015610173573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019791906103d0565b505050505050505050565b60606000858585856040516020016101bd94939291906103e9565b6040516020818303038152906040529050888888836040516020016101e59493929190610410565b604051602081830303815290604052915050979650505050505050565b6001600160a01b038116811461021757600080fd5b50565b60008083601f84011261022c57600080fd5b50813567ffffffffffffffff81111561024457600080fd5b60208301915083602082850101111561025c57600080fd5b9250929050565b600080600080600080600060a0888a03121561027e57600080fd5b873561028981610202565b9650602088013561029981610202565b955060408801359450606088013567ffffffffffffffff808211156102bd57600080fd5b6102c98b838c0161021a565b909650945060808a01359150808211156102e257600080fd5b506102ef8a828b0161021a565b989b979a50959850939692959293505050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6001600160a01b038681168252851660208201526040810184905260806060820181905260009061035f9083018486610302565b979650505050505050565b60005b8381101561038557818101518382015260200161036d565b50506000910152565b60018060a01b038316815260406020820152600082518060408401526103bb81606085016020870161036a565b601f01601f1916919091016060019392505050565b6000602082840312156103e257600080fd5b5051919050565b6040815260006103fd604083018688610302565b828103602084015261035f818587610302565b60006bffffffffffffffffffffffff19808760601b168352808660601b16601484015250836028830152825161044d81604885016020870161036a565b919091016048019594505050505056fea2646970667358221220963d2a6a38e800c0a3ba04759b9e7c546f6e440dac437e91d4405ca2785c10ff64736f6c63430008130033", "linkReferences": {}, "deployedLinkReferences": {}, "devdoc": { @@ -100,7 +100,7 @@ "notice": "Transfer an ERC-721 token to a DApp and add an input to the DApp's input box to signal such operation. The caller must change the approved address for the ERC-721 token to the portal address beforehand, by calling the `approve` function in the token contract." }, "getInputBox()": { - "notice": "Get the input box used by this portal." + "notice": "Get the input box used by this input relay." } }, "notice": "This contract allows anyone to perform transfers of ERC-721 tokens to a DApp while informing the off-chain machine.", diff --git a/onchain/rollups/export/artifacts/contracts/portals/EtherPortal.sol/EtherPortal.json b/onchain/rollups/export/artifacts/contracts/portals/EtherPortal.sol/EtherPortal.json index 6e092bad..d403841e 100644 --- a/onchain/rollups/export/artifacts/contracts/portals/EtherPortal.sol/EtherPortal.json +++ b/onchain/rollups/export/artifacts/contracts/portals/EtherPortal.sol/EtherPortal.json @@ -50,8 +50,8 @@ "type": "function" } ], - "bytecode": "0x60a060405234801561001057600080fd5b506040516103de3803806103de83398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b60805161034d61009160003960008181603c0152610128015261034d6000f3fe6080604052600436106100285760003560e01c8062aace9a1461002d578063938c054f14610077575b600080fd5b34801561003957600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a6100853660046101dc565b61008c565b005b6000836001600160a01b03163460405160006040518083038185875af1925050503d80600081146100d9576040519150601f19603f3d011682016040523d82523d6000602084013e6100de565b606091505b505090508061010057604051630ce8f45160e31b815260040160405180910390fd5b600061010e333486866101aa565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd639061015f908890859060040161026d565b6020604051808303816000875af115801561017e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101a291906102cb565b505050505050565b6060848484846040516020016101c394939291906102e4565b6040516020818303038152906040529050949350505050565b6000806000604084860312156101f157600080fd5b83356001600160a01b038116811461020857600080fd5b9250602084013567ffffffffffffffff8082111561022557600080fd5b818601915086601f83011261023957600080fd5b81358181111561024857600080fd5b87602082850101111561025a57600080fd5b6020830194508093505050509250925092565b60018060a01b038316815260006020604081840152835180604085015260005b818110156102a95785810183015185820160600152820161028d565b506000606082860101526060601f19601f830116850101925050509392505050565b6000602082840312156102dd57600080fd5b5051919050565b6bffffffffffffffffffffffff198560601b1681528360148201528183603483013760009101603401908152939250505056fea2646970667358221220ba2d464106e2f6626cc43ffe3965abf5a23e6b91972133e44336b25ea512923064736f6c63430008130033", - "deployedBytecode": "0x6080604052600436106100285760003560e01c8062aace9a1461002d578063938c054f14610077575b600080fd5b34801561003957600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a6100853660046101dc565b61008c565b005b6000836001600160a01b03163460405160006040518083038185875af1925050503d80600081146100d9576040519150601f19603f3d011682016040523d82523d6000602084013e6100de565b606091505b505090508061010057604051630ce8f45160e31b815260040160405180910390fd5b600061010e333486866101aa565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd639061015f908890859060040161026d565b6020604051808303816000875af115801561017e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101a291906102cb565b505050505050565b6060848484846040516020016101c394939291906102e4565b6040516020818303038152906040529050949350505050565b6000806000604084860312156101f157600080fd5b83356001600160a01b038116811461020857600080fd5b9250602084013567ffffffffffffffff8082111561022557600080fd5b818601915086601f83011261023957600080fd5b81358181111561024857600080fd5b87602082850101111561025a57600080fd5b6020830194508093505050509250925092565b60018060a01b038316815260006020604081840152835180604085015260005b818110156102a95785810183015185820160600152820161028d565b506000606082860101526060601f19601f830116850101925050509392505050565b6000602082840312156102dd57600080fd5b5051919050565b6bffffffffffffffffffffffff198560601b1681528360148201528183603483013760009101603401908152939250505056fea2646970667358221220ba2d464106e2f6626cc43ffe3965abf5a23e6b91972133e44336b25ea512923064736f6c63430008130033", + "bytecode": "0x60a060405234801561001057600080fd5b506040516103de3803806103de83398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b60805161034d61009160003960008181603c0152610128015261034d6000f3fe6080604052600436106100285760003560e01c8062aace9a1461002d578063938c054f14610077575b600080fd5b34801561003957600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a6100853660046101dc565b61008c565b005b6000836001600160a01b03163460405160006040518083038185875af1925050503d80600081146100d9576040519150601f19603f3d011682016040523d82523d6000602084013e6100de565b606091505b505090508061010057604051630ce8f45160e31b815260040160405180910390fd5b600061010e333486866101aa565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd639061015f908890859060040161026d565b6020604051808303816000875af115801561017e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101a291906102cb565b505050505050565b6060848484846040516020016101c394939291906102e4565b6040516020818303038152906040529050949350505050565b6000806000604084860312156101f157600080fd5b83356001600160a01b038116811461020857600080fd5b9250602084013567ffffffffffffffff8082111561022557600080fd5b818601915086601f83011261023957600080fd5b81358181111561024857600080fd5b87602082850101111561025a57600080fd5b6020830194508093505050509250925092565b60018060a01b038316815260006020604081840152835180604085015260005b818110156102a95785810183015185820160600152820161028d565b506000606082860101526060601f19601f830116850101925050509392505050565b6000602082840312156102dd57600080fd5b5051919050565b6bffffffffffffffffffffffff198560601b1681528360148201528183603483013760009101603401908152939250505056fea264697066735822122061a5636c12dd05b943b90c92470347a1823c20f65a4a11350f8d4ed93ab1859a64736f6c63430008130033", + "deployedBytecode": "0x6080604052600436106100285760003560e01c8062aace9a1461002d578063938c054f14610077575b600080fd5b34801561003957600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a6100853660046101dc565b61008c565b005b6000836001600160a01b03163460405160006040518083038185875af1925050503d80600081146100d9576040519150601f19603f3d011682016040523d82523d6000602084013e6100de565b606091505b505090508061010057604051630ce8f45160e31b815260040160405180910390fd5b600061010e333486866101aa565b604051631789cd6360e01b81529091506001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690631789cd639061015f908890859060040161026d565b6020604051808303816000875af115801561017e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101a291906102cb565b505050505050565b6060848484846040516020016101c394939291906102e4565b6040516020818303038152906040529050949350505050565b6000806000604084860312156101f157600080fd5b83356001600160a01b038116811461020857600080fd5b9250602084013567ffffffffffffffff8082111561022557600080fd5b818601915086601f83011261023957600080fd5b81358181111561024857600080fd5b87602082850101111561025a57600080fd5b6020830194508093505050509250925092565b60018060a01b038316815260006020604081840152835180604085015260005b818110156102a95785810183015185820160600152820161028d565b506000606082860101526060601f19601f830116850101925050509392505050565b6000602082840312156102dd57600080fd5b5051919050565b6bffffffffffffffffffffffff198560601b1681528360148201528183603483013760009101603401908152939250505056fea264697066735822122061a5636c12dd05b943b90c92470347a1823c20f65a4a11350f8d4ed93ab1859a64736f6c63430008130033", "linkReferences": {}, "deployedLinkReferences": {}, "devdoc": { @@ -95,7 +95,7 @@ "notice": "Transfer Ether to a DApp and add an input to the DApp's input box to signal such operation. All the value sent through this function is forwarded to the DApp." }, "getInputBox()": { - "notice": "Get the input box used by this portal." + "notice": "Get the input box used by this input relay." } }, "notice": "This contract allows anyone to perform transfers of Ether to a DApp while informing the off-chain machine.", diff --git a/onchain/rollups/export/artifacts/contracts/portals/IERC1155BatchPortal.sol/IERC1155BatchPortal.json b/onchain/rollups/export/artifacts/contracts/portals/IERC1155BatchPortal.sol/IERC1155BatchPortal.json index 12aaae2f..f1c95422 100644 --- a/onchain/rollups/export/artifacts/contracts/portals/IERC1155BatchPortal.sol/IERC1155BatchPortal.json +++ b/onchain/rollups/export/artifacts/contracts/portals/IERC1155BatchPortal.sol/IERC1155BatchPortal.json @@ -88,7 +88,7 @@ "notice": "Transfer a batch of ERC-1155 tokens to a DApp and add an input to the DApp's input box to signal such operation. The caller must enable approval for the portal to manage all of their tokens beforehand, by calling the `setApprovalForAll` function in the token contract." }, "getInputBox()": { - "notice": "Get the input box used by this portal." + "notice": "Get the input box used by this input relay." } }, "version": 1 diff --git a/onchain/rollups/export/artifacts/contracts/portals/IERC1155SinglePortal.sol/IERC1155SinglePortal.json b/onchain/rollups/export/artifacts/contracts/portals/IERC1155SinglePortal.sol/IERC1155SinglePortal.json index b9f3b744..992bb5d1 100644 --- a/onchain/rollups/export/artifacts/contracts/portals/IERC1155SinglePortal.sol/IERC1155SinglePortal.json +++ b/onchain/rollups/export/artifacts/contracts/portals/IERC1155SinglePortal.sol/IERC1155SinglePortal.json @@ -87,7 +87,7 @@ "notice": "Transfer an ERC-1155 token to a DApp and add an input to the DApp's input box to signal such operation. The caller must enable approval for the portal to manage all of their tokens beforehand, by calling the `setApprovalForAll` function in the token contract." }, "getInputBox()": { - "notice": "Get the input box used by this portal." + "notice": "Get the input box used by this input relay." } }, "version": 1 diff --git a/onchain/rollups/export/artifacts/contracts/portals/IERC20Portal.sol/IERC20Portal.json b/onchain/rollups/export/artifacts/contracts/portals/IERC20Portal.sol/IERC20Portal.json index c96a1c97..43244d49 100644 --- a/onchain/rollups/export/artifacts/contracts/portals/IERC20Portal.sol/IERC20Portal.json +++ b/onchain/rollups/export/artifacts/contracts/portals/IERC20Portal.sol/IERC20Portal.json @@ -75,7 +75,7 @@ "notice": "Transfer ERC-20 tokens to a DApp and add an input to the DApp's input box to signal such operation. The caller must allow the portal to withdraw at least `_amount` tokens from their account beforehand, by calling the `approve` function in the token contract." }, "getInputBox()": { - "notice": "Get the input box used by this portal." + "notice": "Get the input box used by this input relay." } }, "version": 1 diff --git a/onchain/rollups/export/artifacts/contracts/portals/IERC721Portal.sol/IERC721Portal.json b/onchain/rollups/export/artifacts/contracts/portals/IERC721Portal.sol/IERC721Portal.json index 54f96237..de170a4b 100644 --- a/onchain/rollups/export/artifacts/contracts/portals/IERC721Portal.sol/IERC721Portal.json +++ b/onchain/rollups/export/artifacts/contracts/portals/IERC721Portal.sol/IERC721Portal.json @@ -81,7 +81,7 @@ "notice": "Transfer an ERC-721 token to a DApp and add an input to the DApp's input box to signal such operation. The caller must change the approved address for the ERC-721 token to the portal address beforehand, by calling the `approve` function in the token contract." }, "getInputBox()": { - "notice": "Get the input box used by this portal." + "notice": "Get the input box used by this input relay." } }, "version": 1 diff --git a/onchain/rollups/export/artifacts/contracts/portals/IEtherPortal.sol/IEtherPortal.json b/onchain/rollups/export/artifacts/contracts/portals/IEtherPortal.sol/IEtherPortal.json index 0f9a1128..0bcc4144 100644 --- a/onchain/rollups/export/artifacts/contracts/portals/IEtherPortal.sol/IEtherPortal.json +++ b/onchain/rollups/export/artifacts/contracts/portals/IEtherPortal.sol/IEtherPortal.json @@ -64,7 +64,7 @@ "notice": "Transfer Ether to a DApp and add an input to the DApp's input box to signal such operation. All the value sent through this function is forwarded to the DApp." }, "getInputBox()": { - "notice": "Get the input box used by this portal." + "notice": "Get the input box used by this input relay." } }, "version": 1 diff --git a/onchain/rollups/export/artifacts/contracts/portals/IPortal.sol/IPortal.json b/onchain/rollups/export/artifacts/contracts/portals/IPortal.sol/IPortal.json deleted file mode 100644 index 9fb30907..00000000 --- a/onchain/rollups/export/artifacts/contracts/portals/IPortal.sol/IPortal.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "contractName": "IPortal", - "sourceName": "contracts/portals/IPortal.sol", - "abi": [ - { - "inputs": [], - "name": "getInputBox", - "outputs": [ - { - "internalType": "contract IInputBox", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - } - ], - "bytecode": "0x", - "deployedBytecode": "0x", - "linkReferences": {}, - "deployedLinkReferences": {}, - "devdoc": { - "kind": "dev", - "methods": { - "getInputBox()": { - "returns": { - "_0": "The input box" - } - } - }, - "title": "Portal interface", - "version": 1 - }, - "userdoc": { - "kind": "user", - "methods": { - "getInputBox()": { - "notice": "Get the input box used by this portal." - } - }, - "version": 1 - }, - "evm": { - "gasEstimates": null, - "methodIdentifiers": { - "getInputBox()": "00aace9a" - } - } -} \ No newline at end of file diff --git a/onchain/rollups/export/artifacts/contracts/portals/Portal.sol/Portal.json b/onchain/rollups/export/artifacts/contracts/portals/Portal.sol/Portal.json deleted file mode 100644 index 03ada467..00000000 --- a/onchain/rollups/export/artifacts/contracts/portals/Portal.sol/Portal.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "contractName": "Portal", - "sourceName": "contracts/portals/Portal.sol", - "abi": [ - { - "inputs": [ - { - "internalType": "contract IInputBox", - "name": "_inputBox", - "type": "address" - } - ], - "stateMutability": "nonpayable", - "type": "constructor" - }, - { - "inputs": [], - "name": "getInputBox", - "outputs": [ - { - "internalType": "contract IInputBox", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - } - ], - "bytecode": "0x60a060405234801561001057600080fd5b5060405161012738038061012783398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b608051609f6100886000396000602e0152609f6000f3fe6080604052348015600f57600080fd5b506004361060275760003560e01c8062aace9a14602c575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f3fea26469706673582212204ee072902b262ca03c0c6575a65cedc3512a85746993fa545f595538b72278c464736f6c63430008130033", - "deployedBytecode": "0x6080604052348015600f57600080fd5b506004361060275760003560e01c8062aace9a14602c575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f3fea26469706673582212204ee072902b262ca03c0c6575a65cedc3512a85746993fa545f595538b72278c464736f6c63430008130033", - "linkReferences": {}, - "deployedLinkReferences": {}, - "devdoc": { - "kind": "dev", - "methods": { - "constructor": { - "params": { - "_inputBox": "The input box used by the portal" - } - }, - "getInputBox()": { - "returns": { - "_0": "The input box" - } - } - }, - "title": "Portal", - "version": 1 - }, - "userdoc": { - "kind": "user", - "methods": { - "constructor": { - "notice": "Constructs the portal." - }, - "getInputBox()": { - "notice": "Get the input box used by this portal." - } - }, - "notice": "This contract serves as a base for all the other portals.", - "version": 1 - }, - "evm": { - "gasEstimates": { - "creation": { - "codeDepositCost": "31800", - "executionCost": "infinite", - "totalCost": "infinite" - }, - "external": { - "getInputBox()": "infinite" - } - }, - "methodIdentifiers": { - "getInputBox()": "00aace9a" - } - } -} \ No newline at end of file diff --git a/onchain/rollups/export/artifacts/contracts/relays/DAppAddressRelay.sol/DAppAddressRelay.json b/onchain/rollups/export/artifacts/contracts/relays/DAppAddressRelay.sol/DAppAddressRelay.json index a392699b..0a57b182 100644 --- a/onchain/rollups/export/artifacts/contracts/relays/DAppAddressRelay.sol/DAppAddressRelay.json +++ b/onchain/rollups/export/artifacts/contracts/relays/DAppAddressRelay.sol/DAppAddressRelay.json @@ -40,8 +40,8 @@ "type": "function" } ], - "bytecode": "0x60a060405234801561001057600080fd5b506040516102bc3803806102bc83398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b60805161022c61009060003960008181603c015260c8015261022c6000f3fe608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a5780633016f49e14610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a61008536600461014f565b61008c565b005b60408051606083901b6bffffffffffffffffffffffff19166020820152815180820360140181526034820192839052631789cd6360e01b9092527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690631789cd6390610107908590859060380161017f565b6020604051808303816000875af1158015610126573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014a91906101dd565b505050565b60006020828403121561016157600080fd5b81356001600160a01b038116811461017857600080fd5b9392505050565b60018060a01b038316815260006020604081840152835180604085015260005b818110156101bb5785810183015185820160600152820161019f565b506000606082860101526060601f19601f830116850101925050509392505050565b6000602082840312156101ef57600080fd5b505191905056fea2646970667358221220036b7931a64a263125402178924d02d790062a9132d57ec57aa19877b0fcaaa764736f6c63430008130033", - "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a5780633016f49e14610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a61008536600461014f565b61008c565b005b60408051606083901b6bffffffffffffffffffffffff19166020820152815180820360140181526034820192839052631789cd6360e01b9092527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690631789cd6390610107908590859060380161017f565b6020604051808303816000875af1158015610126573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014a91906101dd565b505050565b60006020828403121561016157600080fd5b81356001600160a01b038116811461017857600080fd5b9392505050565b60018060a01b038316815260006020604081840152835180604085015260005b818110156101bb5785810183015185820160600152820161019f565b506000606082860101526060601f19601f830116850101925050509392505050565b6000602082840312156101ef57600080fd5b505191905056fea2646970667358221220036b7931a64a263125402178924d02d790062a9132d57ec57aa19877b0fcaaa764736f6c63430008130033", + "bytecode": "0x60a060405234801561001057600080fd5b506040516102bc3803806102bc83398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b60805161022c61009060003960008181603c015260c8015261022c6000f3fe608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a5780633016f49e14610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a61008536600461014f565b61008c565b005b60408051606083901b6bffffffffffffffffffffffff19166020820152815180820360140181526034820192839052631789cd6360e01b9092527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690631789cd6390610107908590859060380161017f565b6020604051808303816000875af1158015610126573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014a91906101dd565b505050565b60006020828403121561016157600080fd5b81356001600160a01b038116811461017857600080fd5b9392505050565b60018060a01b038316815260006020604081840152835180604085015260005b818110156101bb5785810183015185820160600152820161019f565b506000606082860101526060601f19601f830116850101925050509392505050565b6000602082840312156101ef57600080fd5b505191905056fea26469706673582212202ca7ad28494a747ec0481d164da7151ec32dba6023a1b4fa46865fdf922a303164736f6c63430008130033", + "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100355760003560e01c8062aace9a1461003a5780633016f49e14610077575b600080fd5b7f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b61008a61008536600461014f565b61008c565b005b60408051606083901b6bffffffffffffffffffffffff19166020820152815180820360140181526034820192839052631789cd6360e01b9092527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690631789cd6390610107908590859060380161017f565b6020604051808303816000875af1158015610126573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014a91906101dd565b505050565b60006020828403121561016157600080fd5b81356001600160a01b038116811461017857600080fd5b9392505050565b60018060a01b038316815260006020604081840152835180604085015260005b818110156101bb5785810183015185820160600152820161019f565b506000606082860101526060601f19601f830116850101925050509392505050565b6000602082840312156101ef57600080fd5b505191905056fea26469706673582212202ca7ad28494a747ec0481d164da7151ec32dba6023a1b4fa46865fdf922a303164736f6c63430008130033", "linkReferences": {}, "deployedLinkReferences": {}, "devdoc": { @@ -73,7 +73,7 @@ "notice": "Constructs the relay." }, "getInputBox()": { - "notice": "Get the input box used by this relay." + "notice": "Get the input box used by this input relay." }, "relayDAppAddress(address)": { "notice": "Add an input to a DApp's input box with its address." diff --git a/onchain/rollups/export/artifacts/contracts/relays/IDAppAddressRelay.sol/IDAppAddressRelay.json b/onchain/rollups/export/artifacts/contracts/relays/IDAppAddressRelay.sol/IDAppAddressRelay.json index 48279476..b910d6f3 100644 --- a/onchain/rollups/export/artifacts/contracts/relays/IDAppAddressRelay.sol/IDAppAddressRelay.json +++ b/onchain/rollups/export/artifacts/contracts/relays/IDAppAddressRelay.sol/IDAppAddressRelay.json @@ -54,7 +54,7 @@ "kind": "user", "methods": { "getInputBox()": { - "notice": "Get the input box used by this relay." + "notice": "Get the input box used by this input relay." }, "relayDAppAddress(address)": { "notice": "Add an input to a DApp's input box with its address."