Merge branch 'main' into update-opbnb

lifinance · Oct 23, 2024 · 3a3f796 · 3a3f796
2 parents 52fc0a6 + bdc8e29
commit 3a3f796
Show file tree

Hide file tree

Showing 53 changed files with 50 additions and 224 deletions.
diff --git a/docs/CircleBridgeFacet.md → archive/docs/CircleBridgeFacet.md b/docs/CircleBridgeFacet.md → archive/docs/CircleBridgeFacet.md
diff --git a/...ploy/facets/DeployCircleBridgeFacet.s.sol → ...ipts/Deploy/DeployCircleBridgeFacet.s.sol b/...ploy/facets/DeployCircleBridgeFacet.s.sol → ...ipts/Deploy/DeployCircleBridgeFacet.s.sol
diff --git a/archive/scripts/DeployDeBridgeDlnFacet.s.sol → ...ripts/Deploy/DeployDeBridgeDlnFacet.s.sol b/archive/scripts/DeployDeBridgeDlnFacet.s.sol → ...ripts/Deploy/DeployDeBridgeDlnFacet.s.sol
diff --git a/archive/scripts/DeployDeBridgeFacet.s.sol → .../scripts/Deploy/DeployDeBridgeFacet.s.sol b/archive/scripts/DeployDeBridgeFacet.s.sol → .../scripts/Deploy/DeployDeBridgeFacet.s.sol
diff --git a/...y/facets/DeployGasRebateDistributor.s.sol → ...s/Deploy/DeployGasRebateDistributor.s.sol b/...y/facets/DeployGasRebateDistributor.s.sol → ...s/Deploy/DeployGasRebateDistributor.s.sol
diff --git a/...oy/facets/DeployGnosisBridgeL2Facet.s.sol → ...ts/Deploy/DeployGnosisBridgeL2Facet.s.sol b/...oy/facets/DeployGnosisBridgeL2Facet.s.sol → ...ts/Deploy/DeployGnosisBridgeL2Facet.s.sol
diff --git a/.../scripts/DeployLiFiDiamondImmutable.s.sol → ...s/Deploy/DeployLiFiDiamondImmutable.s.sol b/.../scripts/DeployLiFiDiamondImmutable.s.sol → ...s/Deploy/DeployLiFiDiamondImmutable.s.sol
diff --git a/...ve/scripts/DeployMakerTeleportFacet.s.sol → ...pts/Deploy/DeployMakerTeleportFacet.s.sol b/...ve/scripts/DeployMakerTeleportFacet.s.sol → ...pts/Deploy/DeployMakerTeleportFacet.s.sol
diff --git a/archive/scripts/DeployMultichainFacet.s.sol → ...cripts/Deploy/DeployMultichainFacet.s.sol b/archive/scripts/DeployMultichainFacet.s.sol → ...cripts/Deploy/DeployMultichainFacet.s.sol
diff --git a/...oyNonStandardSelectorsRegistryFacet.s.sol → ...oyNonStandardSelectorsRegistryFacet.s.sol b/...oyNonStandardSelectorsRegistryFacet.s.sol → ...oyNonStandardSelectorsRegistryFacet.s.sol
diff --git a/...oy/facets/DeployServiceFeeCollector.s.sol → ...ts/Deploy/DeployServiceFeeCollector.s.sol b/...oy/facets/DeployServiceFeeCollector.s.sol → ...ts/Deploy/DeployServiceFeeCollector.s.sol
diff --git a/...ve/scripts/DeploySynapseBridgeFacet.s.sol → ...pts/Deploy/DeploySynapseBridgeFacet.s.sol b/...ve/scripts/DeploySynapseBridgeFacet.s.sol → ...pts/Deploy/DeploySynapseBridgeFacet.s.sol
diff --git a/...ploy/facets/UpdateCircleBridgeFacet.s.sol → ...ipts/Deploy/UpdateCircleBridgeFacet.s.sol b/...ploy/facets/UpdateCircleBridgeFacet.s.sol → ...ipts/Deploy/UpdateCircleBridgeFacet.s.sol
diff --git a/archive/scripts/UpdateDeBridgeDlnFacet.s.sol → ...ripts/Deploy/UpdateDeBridgeDlnFacet.s.sol b/archive/scripts/UpdateDeBridgeDlnFacet.s.sol → ...ripts/Deploy/UpdateDeBridgeDlnFacet.s.sol
diff --git a/archive/scripts/UpdateDeBridgeFacet.s.sol → .../scripts/Deploy/UpdateDeBridgeFacet.s.sol b/archive/scripts/UpdateDeBridgeFacet.s.sol → .../scripts/Deploy/UpdateDeBridgeFacet.s.sol
diff --git a/...oy/facets/UpdateGnosisBridgeL2Facet.s.sol → ...ts/Deploy/UpdateGnosisBridgeL2Facet.s.sol b/...oy/facets/UpdateGnosisBridgeL2Facet.s.sol → ...ts/Deploy/UpdateGnosisBridgeL2Facet.s.sol
diff --git a/...ve/scripts/UpdateMakerTeleportFacet.s.sol → ...pts/Deploy/UpdateMakerTeleportFacet.s.sol b/...ve/scripts/UpdateMakerTeleportFacet.s.sol → ...pts/Deploy/UpdateMakerTeleportFacet.s.sol
diff --git a/archive/scripts/UpdateMultichainFacet.s.sol → ...cripts/Deploy/UpdateMultichainFacet.s.sol b/archive/scripts/UpdateMultichainFacet.s.sol → ...cripts/Deploy/UpdateMultichainFacet.s.sol
diff --git a/...dateNonStandardSelectorsRegistryFacet.sol → ...dateNonStandardSelectorsRegistryFacet.sol b/...dateNonStandardSelectorsRegistryFacet.sol → ...dateNonStandardSelectorsRegistryFacet.sol
diff --git a/...ve/scripts/UpdateSynapseBridgeFacet.s.sol → ...pts/Deploy/UpdateSynapseBridgeFacet.s.sol b/...ve/scripts/UpdateSynapseBridgeFacet.s.sol → ...pts/Deploy/UpdateSynapseBridgeFacet.s.sol
diff --git a/...ksync/008_deploy_service_fee_collector.ts → ...kSync/008_deploy_service_fee_collector.ts b/...ksync/008_deploy_service_fee_collector.ts → ...kSync/008_deploy_service_fee_collector.ts
@@ -1,13 +1,13 @@
 import { HardhatRuntimeEnvironment } from 'hardhat/types'
 import { DeployFunction } from 'hardhat-deploy/types'
 import { ethers, network } from 'hardhat'
-import { PeripheryRegistryFacet } from '../../../typechain'
+import { PeripheryRegistryFacet } from '../../../../typechain'
 import {
   diamondContractName,
   updateDeploymentLogs,
   verifyContract,
-} from './9999_utils'
-import globalConfig from '../../../config/global.json'
+} from '../../../../script/deploy/zksync/9999_utils'
+import globalConfig from '../../../../config/global.json'
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   // Protect against unwanted redeployments

diff --git a/...ty/AcceptOwnershipTransferPeriphery.s.sol → ...ks/AcceptOwnershipTransferPeriphery.s.sol b/...ty/AcceptOwnershipTransferPeriphery.s.sol → ...ks/AcceptOwnershipTransferPeriphery.s.sol
diff --git a/...pts/AddRoutersAndTokenForMultichain.s.sol → ...sks/AddRoutersAndTokenForMultichain.s.sol b/...pts/AddRoutersAndTokenForMultichain.s.sol → ...sks/AddRoutersAndTokenForMultichain.s.sol
diff --git a/...s/solidity/MakeLiFiDiamondImmutable.s.sol → ...ipts/Tasks/MakeLiFiDiamondImmutable.s.sol b/...s/solidity/MakeLiFiDiamondImmutable.s.sol → ...ipts/Tasks/MakeLiFiDiamondImmutable.s.sol
diff --git a/...usableSelectorsFromImmutableDiamond.s.sol → ...usableSelectorsFromImmutableDiamond.s.sol b/...usableSelectorsFromImmutableDiamond.s.sol → ...usableSelectorsFromImmutableDiamond.s.sol
diff --git a/...hipOfPeripheryContractsForImmutable.s.sol → ...hipOfPeripheryContractsForImmutable.s.sol b/...hipOfPeripheryContractsForImmutable.s.sol → ...hipOfPeripheryContractsForImmutable.s.sol
diff --git a/archive/scripts/diamondMakeImmutable.sh → ...ive/scripts/Tasks/diamondMakeImmutable.sh b/archive/scripts/diamondMakeImmutable.sh → ...ive/scripts/Tasks/diamondMakeImmutable.sh
diff --git a/archive/src/DeBridgeDlnFacet.sol b/archive/src/DeBridgeDlnFacet.sol
diff --git a/archive/src/AxelarFacet.sol → archive/src/Facets/AxelarFacet.sol b/archive/src/AxelarFacet.sol → archive/src/Facets/AxelarFacet.sol
diff --git a/src/Facets/CelerIMFacetImmutable.sol → archive/src/Facets/CelerIMFacetImmutable.sol b/src/Facets/CelerIMFacetImmutable.sol → archive/src/Facets/CelerIMFacetImmutable.sol
diff --git a/src/Facets/CircleBridgeFacet.sol → archive/src/Facets/CircleBridgeFacet.sol b/src/Facets/CircleBridgeFacet.sol → archive/src/Facets/CircleBridgeFacet.sol
diff --git a/archive/src/DeBridgeFacet.sol → archive/src/Facets/DeBridgeFacet.sol b/archive/src/DeBridgeFacet.sol → archive/src/Facets/DeBridgeFacet.sol
diff --git a/src/Facets/GnosisBridgeL2Facet.sol → archive/src/Facets/GnosisBridgeL2Facet.sol b/src/Facets/GnosisBridgeL2Facet.sol → archive/src/Facets/GnosisBridgeL2Facet.sol
diff --git a/archive/src/MakerTeleportFacet.sol → archive/src/Facets/MakerTeleportFacet.sol b/archive/src/MakerTeleportFacet.sol → archive/src/Facets/MakerTeleportFacet.sol
diff --git a/archive/src/MultichainFacet.sol → archive/src/Facets/MultichainFacet.sol b/archive/src/MultichainFacet.sol → archive/src/Facets/MultichainFacet.sol
diff --git a/archive/src/NXTPFacet.sol → archive/src/Facets/NXTPFacet.sol b/archive/src/NXTPFacet.sol → archive/src/Facets/NXTPFacet.sol
diff --git a/...ets/NonStandardSelectorsRegistryFacet.sol → ...ets/NonStandardSelectorsRegistryFacet.sol b/...ets/NonStandardSelectorsRegistryFacet.sol → ...ets/NonStandardSelectorsRegistryFacet.sol
diff --git a/archive/src/SynapseBridgeFacet.sol → archive/src/Facets/SynapseBridgeFacet.sol b/archive/src/SynapseBridgeFacet.sol → archive/src/Facets/SynapseBridgeFacet.sol
diff --git a/archive/src/WormholeFacet.sol → archive/src/Facets/WormholeFacet.sol b/archive/src/WormholeFacet.sol → archive/src/Facets/WormholeFacet.sol
diff --git a/archive/src/AxelarExecutor.sol → archive/src/Periphery/AxelarExecutor.sol b/archive/src/AxelarExecutor.sol → archive/src/Periphery/AxelarExecutor.sol
diff --git a/archive/src/FusePoolZap.sol → archive/src/Periphery/FusePoolZap.sol b/archive/src/FusePoolZap.sol → archive/src/Periphery/FusePoolZap.sol
diff --git a/src/Periphery/GasRebateDistributor.sol → ...ve/src/Periphery/GasRebateDistributor.sol b/src/Periphery/GasRebateDistributor.sol → ...ve/src/Periphery/GasRebateDistributor.sol
diff --git a/src/Periphery/ServiceFeeCollector.sol → ...ive/src/Periphery/ServiceFeeCollector.sol b/src/Periphery/ServiceFeeCollector.sol → ...ive/src/Periphery/ServiceFeeCollector.sol
diff --git a/test/solidity/Facets/CircleBridgeFacet.t.sol → archive/test/CircleBridgeFacet.t.sol b/test/solidity/Facets/CircleBridgeFacet.t.sol → archive/test/CircleBridgeFacet.t.sol
diff --git a/...dity/Periphery/GasRebateDistributor.t.sol → archive/test/GasRebateDistributor.t.sol b/...dity/Periphery/GasRebateDistributor.t.sol → archive/test/GasRebateDistributor.t.sol
diff --git a/...solidity/Facets/GnosisBridgeL2Facet.t.sol → archive/test/GnosisBridgeL2Facet.t.sol b/...solidity/Facets/GnosisBridgeL2Facet.t.sol → archive/test/GnosisBridgeL2Facet.t.sol
diff --git a/...s/NonStandardSelectorsRegistryFacet.t.sol → ...t/NonStandardSelectorsRegistryFacet.t.sol b/...s/NonStandardSelectorsRegistryFacet.t.sol → ...t/NonStandardSelectorsRegistryFacet.t.sol
diff --git a/...idity/Periphery/ServiceFeeCollector.t.sol → archive/test/ServiceFeeCollector.t.sol b/...idity/Periphery/ServiceFeeCollector.t.sol → archive/test/ServiceFeeCollector.t.sol
diff --git a/config/dexs.json b/config/dexs.json
@@ -393,7 +393,8 @@
     "0x79540403cdE176Ca5f1fb95bE84A7ec91fFDEF76",
     "0x7fA60f4A59Dd8285C5Fcd8fd2A92A2Ca45ef8a0C",
     "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
-    "0x134f525AC05E4724e55C363A9C4FA35ceB13F88d"
+    "0x134f525AC05E4724e55C363A9C4FA35ceB13F88d",
+    "0x6352a56caadc4f1e25cd6c75970fa768a3304e64"
   ],
   "immutablezkevm": [
     "0xAcD913Ad6936Bb662395ac9a66D75bFc77c165fF",

diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/script/deploy/facets/DeployCelerIMFacet.s.sol b/script/deploy/facets/DeployCelerIMFacet.s.sol
@@ -4,14 +4,15 @@ pragma solidity ^0.8.17;
 import { DeployScriptBase } from "./utils/DeployScriptBase.sol";
 import { stdJson } from "forge-std/Script.sol";
 import { CelerIMFacetMutable } from "lifi/Facets/CelerIMFacetMutable.sol";
-import { CelerIMFacetImmutable } from "lifi/Facets/CelerIMFacetImmutable.sol";
 import { CelerIMFacetBase } from "lifi/Helpers/CelerIMFacetBase.sol";
 
 contract DeployScript is DeployScriptBase {
     using stdJson for string;
 
     constructor() DeployScriptBase("CelerIMFacet") {}
 
+    error CelerImFacetImmutableIsArchived();
+
     function run()
         public
         returns (CelerIMFacetBase deployed, bytes memory constructorArgs)
@@ -30,9 +31,7 @@ contract DeployScript is DeployScriptBase {
                 deploy(type(CelerIMFacetMutable).creationCode)
             );
         } else {
-            deployed = CelerIMFacetImmutable(
-                deploy(type(CelerIMFacetImmutable).creationCode)
-            );
+            revert CelerImFacetImmutableIsArchived();
         }
     }
+5 −3		.github/workflows/checks.yml
+2 −6		.github/workflows/release-cycle.yml
+0 −8		CHANGELOG.md
+3 −89		contracts/governance/Governor.sol
+0 −88		contracts/mocks/docs/governance/MyGovernor.sol
+0 −24		contracts/mocks/docs/governance/MyToken.sol
+0 −35		contracts/mocks/docs/governance/MyTokenTimestampBased.sol
+0 −31		contracts/mocks/docs/governance/MyTokenWrapped.sol
+1 −1		contracts/mocks/wizard/MyGovernor3.sol
+1 −1		contracts/package.json
+3 −7		contracts/utils/cryptography/MerkleProof.sol
+1 −1		docs/modules/ROOT/pages/crosschain.adoc
+195 −4		docs/modules/ROOT/pages/governance.adoc
+0 −2		docs/modules/ROOT/pages/index.adoc
+2 −2		package-lock.json
+1 −1		package.json
+5 −8		scripts/prepare-docs.sh
+24 −0		scripts/release/workflow/prepare-release-merge.sh
+0 −55		test/governance/Governor.t.sol
+0 −83		test/governance/Governor.test.js
+4 −24		test/utils/cryptography/MerkleProof.test.js