script: adapt fdk-3.0.0

axieinfinity · Jun 25, 2024 · 95084dd · 95084dd
1 parent 1f0a33f
commit 95084dd
Show file tree

Hide file tree

Showing 23 changed files with 47 additions and 44 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,6 @@ node_modules/
 yarn-error.log
 .yarn
 .yarnrc.yml
-script/data/*
+script/data/*
+dependencies
+deployments/**/exported_address
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,3 @@
-[submodule "lib/forge-std"]
-	path = lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/openzeppelin-contracts"]
-	path = lib/openzeppelin-contracts
-	url = https://github.com/openzeppelin/openzeppelin-contracts
 [submodule "lib/contract-template"]
 	path = lib/contract-template
 	url = https://github.com/axieinfinity/contract-template
@@ -13,15 +7,6 @@
 [submodule "lib/buffer"]
 	path = lib/buffer
 	url = https://github.com/ensdomains/buffer
-[submodule "lib/pyth-sdk-solidity"]
-	path = lib/pyth-sdk-solidity
-	url = https://github.com/pyth-network/pyth-sdk-solidity
-[submodule "lib/solady"]
-	path = lib/solady
-	url = https://github.com/vectorized/solady
-[submodule "lib/foundry-deployment-kit"]
-	path = lib/foundry-deployment-kit
-	url = https://github.com/axieinfinity/foundry-deployment-kit
 [submodule "lib/contract-libs"]
 	path = lib/contract-libs
 	url = https://github.com/axieinfinity/contract-libs
diff --git a/debug.sh b/debug.sh
@@ -1 +1 @@
-source lib/foundry-deployment-kit/debug.sh
+source dependencies/@fdk-0.3.0-beta/debug.sh
diff --git a/foundry.toml b/foundry.toml
@@ -27,4 +27,8 @@ localhost = "http://localhost:8545"
 runs = 256
 
 [invariant]
-runs = 256
+runs = 256
+[dependencies]
+"@fdk" = { version = "0.3.0-beta", url = "https://github.com/axieinfinity/foundry-deployment-kit/archive/refs/tags/v0.3.0-beta.zip" }
+"@pythnetwork-pyth-sdk-solidity" = { version = "2.2.0" }
+"@openzeppelin-contracts" = { version = "4.9.3" }
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/foundry-deployment-kit b/lib/foundry-deployment-kit
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/pyth-sdk-solidity b/lib/pyth-sdk-solidity
diff --git a/lib/solady b/lib/solady
diff --git a/remappings.txt b/remappings.txt
@@ -1,10 +1,10 @@
 @rns-contracts/=src/
 ds-test/=lib/forge-std/lib/ds-test/src/
-forge-std/=lib/forge-std/src/
-@openzeppelin/=lib/openzeppelin-contracts/
+forge-std/=dependencies/@fdk-0.3.0-beta/dependencies/forge-std-1.8.2/src/
+@openzeppelin/contracts/=dependencies/@openzeppelin-contracts-4.9.3/
 contract-template/=lib/contract-template/src/
-solady/=lib/solady/src/
+@solady/=dependencies/@fdk-0.3.0-beta/dependencies/solady-0.0.206/src/
 @ensdomains/ens-contracts/=lib/ens-contracts/contracts/
 @ensdomains/buffer/=lib/buffer/
-@pythnetwork/=lib/pyth-sdk-solidity/
-foundry-deployment-kit/=lib/foundry-deployment-kit/script/
+@pythnetwork/=dependencies/@pythnetwork-pyth-sdk-solidity-2.2.0/
+@fdk/=dependencies/@fdk-0.3.0-beta/script
diff --git a/run.sh b/run.sh
@@ -1 +1 @@
-source lib/foundry-deployment-kit/run.sh
+source dependencies/@fdk-0.3.0-beta/run.sh
diff --git a/script/20231106-config-prelaunch/20231106_SubmitReservedNames.s.sol b/script/20231106-config-prelaunch/20231106_SubmitReservedNames.s.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
 
 import { console2 as console } from "forge-std/console2.sol";
 import { Contract } from "script/utils/Contract.sol";
-import { JSONParserLib } from "solady/utils/JSONParserLib.sol";
+import { JSONParserLib } from "@solady/utils/JSONParserLib.sol";
 import { Migration } from "script/Migration.s.sol";
 import { LibRNSDomain, RNSUnified } from "@rns-contracts/RNSUnified.sol";
 import { OwnedMulticaller, OwnedMulticallerDeploy } from "script/contracts/OwnedMulticallerDeploy.s.sol";

diff --git a/script/20231114-deploy-name-checker-logic/20231114_DeployNameCheckerLogic.s.sol b/script/20231114-deploy-name-checker-logic/20231114_DeployNameCheckerLogic.s.sol
@@ -6,7 +6,7 @@ import {
   ITransparentUpgradeableProxy,
   TransparentUpgradeableProxy
 } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
-import { LibProxy } from "foundry-deployment-kit/libraries/LibProxy.sol";
+import { LibProxy } from "@fdk/libraries/LibProxy.sol";
 import { NameChecker } from "@rns-contracts/NameChecker.sol";
 import { Contract } from "script/utils/Contract.sol";
 import { Migration } from "script/Migration.s.sol";

diff --git a/...de-auction-and-deploy-rns-operation/20231205_UpgradeRNSAuctionAndDeployRNSOperation.s.sol b/...de-auction-and-deploy-rns-operation/20231205_UpgradeRNSAuctionAndDeployRNSOperation.s.sol
@@ -5,7 +5,7 @@ import { console2 as console } from "forge-std/console2.sol";
 import { ITransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import { ProxyAdmin } from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
 import { Contract } from "script/utils/Contract.sol";
-import { DefaultContract } from "foundry-deployment-kit/utils/DefaultContract.sol";
+import { DefaultContract } from "@fdk/utils/DefaultContract.sol";
 import { ISharedArgument } from "script/interfaces/ISharedArgument.sol";
 import {
   DefaultNetwork,

diff --git a/...parate-tier-and-domain-price/01_UpgradeRNSDomainPrice_OverrideTierForCommunityNames.s.sol b/...parate-tier-and-domain-price/01_UpgradeRNSDomainPrice_OverrideTierForCommunityNames.s.sol
@@ -3,9 +3,9 @@ pragma solidity ^0.8.19;
 
 import { StdStyle } from "forge-std/StdStyle.sol";
 import { IMulticall3 } from "forge-std/interfaces/IMulticall3.sol";
-import { LibString } from "solady/utils/LibString.sol";
-import { DefaultNetwork } from "foundry-deployment-kit/utils/DefaultNetwork.sol";
-import { DefaultContract } from "foundry-deployment-kit/utils/DefaultContract.sol";
+import { LibString } from "@solady/utils/LibString.sol";
+import { DefaultNetwork } from "@fdk/utils/DefaultNetwork.sol";
+import { DefaultContract } from "@fdk/utils/DefaultContract.sol";
 import { Contract } from "../utils/Contract.sol";
 import { INSDomainPrice, RNSDomainPrice } from "@rns-contracts/RNSDomainPrice.sol";
 import "./20240215_Migration.s.sol";

diff --git a/script/20240215-separate-tier-and-domain-price/20240215_Migration.s.sol b/script/20240215-separate-tier-and-domain-price/20240215_Migration.s.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.19;
 
 import { console2 as console } from "forge-std/console2.sol";
-import { JSONParserLib } from "solady/utils/JSONParserLib.sol";
+import { JSONParserLib } from "@solady/utils/JSONParserLib.sol";
 import { Migration, ISharedArgument } from "../Migration.s.sol";
 import { LibRNSDomain } from "@rns-contracts/libraries/LibRNSDomain.sol";
 import { INSDomainPrice } from "@rns-contracts/interfaces/INSDomainPrice.sol";

diff --git a/script/GeneralConfig.sol b/script/GeneralConfig.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import { BaseGeneralConfig } from "foundry-deployment-kit/BaseGeneralConfig.sol";
+import { BaseGeneralConfig } from "@fdk/BaseGeneralConfig.sol";
 import { Contract } from "./utils/Contract.sol";
 
 contract GeneralConfig is BaseGeneralConfig {

diff --git a/script/Migration.s.sol b/script/Migration.s.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import { BaseMigration } from "foundry-deployment-kit/BaseMigration.s.sol";
-import { DefaultNetwork } from "foundry-deployment-kit/utils/DefaultNetwork.sol";
+import { BaseMigration } from "@fdk/BaseMigration.s.sol";
+import { DefaultNetwork } from "@fdk/utils/DefaultNetwork.sol";
 import { GeneralConfig } from "./GeneralConfig.sol";
 import "./interfaces/ISharedArgument.sol";
 

diff --git a/script/interfaces/ISharedArgument.sol b/script/interfaces/ISharedArgument.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import { IGeneralConfig } from "foundry-deployment-kit/interfaces/IGeneralConfig.sol";
+import { IGeneralConfig } from "@fdk/interfaces/IGeneralConfig.sol";
 import { IPyth, INSDomainPrice, PeriodScaler } from "@rns-contracts/RNSDomainPrice.sol";
 import { NameChecker } from "@rns-contracts/NameChecker.sol";
 import { PublicResolver } from "@rns-contracts/resolvers/PublicResolver.sol";

diff --git a/script/utils/Contract.sol b/script/utils/Contract.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import { LibString } from "lib/solady/src/utils/LibString.sol";
-import { TContract } from "foundry-deployment-kit/types/Types.sol";
+import { LibString } from "@solady/utils/LibString.sol";
+import { TContract } from "@fdk/types/Types.sol";
 
 enum Contract {
   RNSUnified,

diff --git a/soldeer.lock b/soldeer.lock
@@ -0,0 +1,17 @@
+[[dependencies]]
+name = "@fdk"
+version = "0.3.0-beta"
+source = "https://github.com/axieinfinity/foundry-deployment-kit/archive/refs/tags/v0.3.0-beta.zip"
+checksum = "aabeda6cc1fe02227d26f3edd86d4af6c91e2167e8b9f1971cc1ea7ce33d34f9"
+
+[[dependencies]]
+name = "@pythnetwork-pyth-sdk-solidity"
+version = "2.2.0"
+source = "https://soldeer-revisions.s3.amazonaws.com/@pythnetwork-pyth-sdk-solidity/2_2_0_15-04-2024_18:50:54_pyth-sdk-solidity.zip"
+checksum = "54e3bda3b27467f84c1605722f58e1d2b5a19d6ca3c24840550f1d6cf3bc2231"
+
+[[dependencies]]
+name = "@openzeppelin-contracts"
+version = "4.9.3"
+source = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts/4_9_3_22-01-2024_13:13:53_contracts.zip"
+checksum = "95886307069cf73310b41396c49df51801a73f31f18f62e7d05adfc2031e7725"
diff --git a/test/RNSUnified/RNSUnified.namehash.t.sol b/test/RNSUnified/RNSUnified.namehash.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.19;
 
 import "./RNSUnified.t.sol";
-import { LibString as SoladyLibString } from "solady/utils/LibString.sol";
+import { LibString as SoladyLibString } from "@solady/utils/LibString.sol";
 
 contract RNSUnified_NameHash_Test is RNSUnifiedTest {
   using SoladyLibString for *;

diff --git a/upload-sig.sh b/upload-sig.sh
@@ -1 +1 @@
-source lib/foundry-deployment-kit/upload-sig.sh
+source dependencies/@fdk-0.3.0-beta/upload-sig.sh
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		source lib/foundry-deployment-kit/debug.sh
		source dependencies/@fdk-0.3.0-beta/debug.sh
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		source lib/foundry-deployment-kit/run.sh
		source dependencies/@fdk-0.3.0-beta/run.sh
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		source lib/foundry-deployment-kit/upload-sig.sh
		source dependencies/@fdk-0.3.0-beta/upload-sig.sh