feat!: remove authority-history pair factory

cartesi · Nov 27, 2023 · cc3ae5c · cc3ae5c
1 parent d063478
commit cc3ae5c
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 3,021 deletions.
diff --git a/onchain/rollups/.changeset/dull-clouds-smash.md b/onchain/rollups/.changeset/dull-clouds-smash.md
@@ -0,0 +1,6 @@
+---
+"@cartesi/rollups": major
+---
+
+Removed `AuthorityHistoryPairFactory` and `IAuthorityHistoryPairFactory`.
+These contracts is no longer be necessary for the new `Authority` contract.
diff --git a/onchain/rollups/contracts/consensus/authority/AuthorityHistoryPairFactory.sol b/onchain/rollups/contracts/consensus/authority/AuthorityHistoryPairFactory.sol
diff --git a/onchain/rollups/contracts/consensus/authority/IAuthorityHistoryPairFactory.sol b/onchain/rollups/contracts/consensus/authority/IAuthorityHistoryPairFactory.sol
diff --git a/onchain/rollups/deploy/02_factory.ts b/onchain/rollups/deploy/02_factory.ts
@@ -23,13 +23,8 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
 
     const { Bitmask, MerkleV2 } = await deployments.all();
 
-    const AuthorityFactory = await deployments.deploy("AuthorityFactory", opts);
-    const HistoryFactory = await deployments.deploy("HistoryFactory", opts);
-
-    await deployments.deploy("AuthorityHistoryPairFactory", {
-        ...opts,
-        args: [AuthorityFactory.address, HistoryFactory.address],
-    });
+    await deployments.deploy("AuthorityFactory", opts);
+    await deployments.deploy("HistoryFactory", opts);
 
     await deployments.deploy("CartesiDAppFactory", {
         ...opts,

diff --git a/onchain/rollups/deployments/arbitrum/AuthorityHistoryPairFactory.json b/onchain/rollups/deployments/arbitrum/AuthorityHistoryPairFactory.json
diff --git a/onchain/rollups/deployments/arbitrum_goerli/AuthorityHistoryPairFactory.json b/onchain/rollups/deployments/arbitrum_goerli/AuthorityHistoryPairFactory.json
diff --git a/onchain/rollups/deployments/mainnet/AuthorityHistoryPairFactory.json b/onchain/rollups/deployments/mainnet/AuthorityHistoryPairFactory.json
diff --git a/onchain/rollups/deployments/optimism/AuthorityHistoryPairFactory.json b/onchain/rollups/deployments/optimism/AuthorityHistoryPairFactory.json
diff --git a/onchain/rollups/deployments/optimism_goerli/AuthorityHistoryPairFactory.json b/onchain/rollups/deployments/optimism_goerli/AuthorityHistoryPairFactory.json
diff --git a/onchain/rollups/deployments/sepolia/AuthorityHistoryPairFactory.json b/onchain/rollups/deployments/sepolia/AuthorityHistoryPairFactory.json
diff --git a/onchain/rollups/export/abi/arbitrum.json b/onchain/rollups/export/abi/arbitrum.json
@@ -1048,154 +1048,6 @@
           "type": "function"
         }
       ]
-    },
-    "AuthorityHistoryPairFactory": {
-      "address": "0x3890A047Cf9Af60731E80B2105362BbDCD70142D",
-      "abi": [
-        {
-          "inputs": [
-            {
-              "internalType": "contract IAuthorityFactory",
-              "name": "_authorityFactory",
-              "type": "address"
-            },
-            {
-              "internalType": "contract IHistoryFactory",
-              "name": "_historyFactory",
-              "type": "address"
-            }
-          ],
-          "stateMutability": "nonpayable",
-          "type": "constructor"
-        },
-        {
-          "anonymous": false,
-          "inputs": [
-            {
-              "indexed": false,
-              "internalType": "contract IAuthorityFactory",
-              "name": "authorityFactory",
-              "type": "address"
-            },
-            {
-              "indexed": false,
-              "internalType": "contract IHistoryFactory",
-              "name": "historyFactory",
-              "type": "address"
-            }
-          ],
-          "name": "AuthorityHistoryPairFactoryCreated",
-          "type": "event"
-        },
-        {
-          "inputs": [
-            {
-              "internalType": "address",
-              "name": "_authorityOwner",
-              "type": "address"
-            },
-            {
-              "internalType": "bytes32",
-              "name": "_salt",
-              "type": "bytes32"
-            }
-          ],
-          "name": "calculateAuthorityHistoryAddressPair",
-          "outputs": [
-            {
-              "internalType": "address",
-              "name": "authorityAddress_",
-              "type": "address"
-            },
-            {
-              "internalType": "address",
-              "name": "historyAddress_",
-              "type": "address"
-            }
-          ],
-          "stateMutability": "view",
-          "type": "function"
-        },
-        {
-          "inputs": [],
-          "name": "getAuthorityFactory",
-          "outputs": [
-            {
-              "internalType": "contract IAuthorityFactory",
-              "name": "",
-              "type": "address"
-            }
-          ],
-          "stateMutability": "view",
-          "type": "function"
-        },
-        {
-          "inputs": [],
-          "name": "getHistoryFactory",
-          "outputs": [
-            {
-              "internalType": "contract IHistoryFactory",
-              "name": "",
-              "type": "address"
-            }
-          ],
-          "stateMutability": "view",
-          "type": "function"
-        },
-        {
-          "inputs": [
-            {
-              "internalType": "address",
-              "name": "_authorityOwner",
-              "type": "address"
-            }
-          ],
-          "name": "newAuthorityHistoryPair",
-          "outputs": [
-            {
-              "internalType": "contract Authority",
-              "name": "authority_",
-              "type": "address"
-            },
-            {
-              "internalType": "contract History",
-              "name": "history_",
-              "type": "address"
-            }
-          ],
-          "stateMutability": "nonpayable",
-          "type": "function"
-        },
-        {
-          "inputs": [
-            {
-              "internalType": "address",
-              "name": "_authorityOwner",
-              "type": "address"
-            },
-            {
-              "internalType": "bytes32",
-              "name": "_salt",
-              "type": "bytes32"
-            }
-          ],
-          "name": "newAuthorityHistoryPair",
-          "outputs": [
-            {
-              "internalType": "contract Authority",
-              "name": "authority_",
-              "type": "address"
-            },
-            {
-              "internalType": "contract History",
-              "name": "history_",
-              "type": "address"
-            }
-          ],
-          "stateMutability": "nonpayable",
-          "type": "function"
-        }
-      ]
     }
   }
-}
+}