@inco/lightning 0.5.1 → 0.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/DeployUtils.sol +15 -14
- package/src/test/IncoTest.sol +1 -1
package/package.json
CHANGED
package/src/DeployUtils.sol
CHANGED
|
@@ -6,15 +6,15 @@ import {Script} from "forge-std/Script.sol";
|
|
|
6
6
|
import {IIncoLightning} from "./interfaces/IIncoLightning.sol";
|
|
7
7
|
import {Vm} from "forge-std/Vm.sol";
|
|
8
8
|
import {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
CreateX,
|
|
10
|
+
createXAddress,
|
|
11
|
+
createXDeployer
|
|
12
12
|
} from "./pasted-dependencies/CreateX.sol";
|
|
13
13
|
import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
|
|
14
14
|
import {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
CONTRACT_NAME,
|
|
16
|
+
MAJOR_VERSION,
|
|
17
|
+
VERIFIER_NAME
|
|
18
18
|
} from "./version/IncoLightningConfig.sol";
|
|
19
19
|
import {IncoVerifier} from "./IncoVerifier.sol";
|
|
20
20
|
import {IIncoVerifier} from "./interfaces/IIncoVerifier.sol";
|
|
@@ -51,7 +51,7 @@ contract DeployUtils is Script {
|
|
|
51
51
|
string memory pepper
|
|
52
52
|
) internal pure returns (bytes32) {
|
|
53
53
|
return
|
|
54
|
-
|
|
54
|
+
bytes32(
|
|
55
55
|
abi.encodePacked(
|
|
56
56
|
deployer,
|
|
57
57
|
crossChainDeployAuthorizedFlag,
|
|
@@ -91,18 +91,13 @@ contract DeployUtils is Script {
|
|
|
91
91
|
string memory pepper,
|
|
92
92
|
IQuoteVerifier quoteVerifier
|
|
93
93
|
)
|
|
94
|
-
|
|
95
|
-
|
|
94
|
+
internal
|
|
95
|
+
returns (IIncoLightning lightningProxy, IIncoVerifier verifierProxy)
|
|
96
96
|
{
|
|
97
97
|
(bytes32 lightningSalt, bytes32 verifierSalt) = getIncoSalts(
|
|
98
98
|
deployer,
|
|
99
99
|
pepper
|
|
100
100
|
);
|
|
101
|
-
console.log(
|
|
102
|
-
"Deploying Inco with deployerAddress: %s, lightning salt: %s",
|
|
103
|
-
vm.toString(deployer),
|
|
104
|
-
vm.toString(lightningSalt)
|
|
105
|
-
);
|
|
106
101
|
lightningProxy = deployLightning(lightningSalt, verifierSalt, deployer);
|
|
107
102
|
verifierProxy = deployVerifier(
|
|
108
103
|
verifierSalt,
|
|
@@ -110,6 +105,12 @@ contract DeployUtils is Script {
|
|
|
110
105
|
deployer,
|
|
111
106
|
quoteVerifier
|
|
112
107
|
);
|
|
108
|
+
console.log(
|
|
109
|
+
"Deploying Inco with executor: %s, deployerAddress: %s, lightning salt: %s",
|
|
110
|
+
vm.toString(address(lightningProxy)),
|
|
111
|
+
vm.toString(deployer),
|
|
112
|
+
vm.toString(lightningSalt)
|
|
113
|
+
);
|
|
113
114
|
}
|
|
114
115
|
|
|
115
116
|
function getIncoSalts(
|
package/src/test/IncoTest.sol
CHANGED
|
@@ -32,7 +32,7 @@ contract IncoTest is MockOpHandler, DeployUtils, FakeDecryptionAttester {
|
|
|
32
32
|
(IIncoLightning proxy, ) = deployIncoLightningUsingConfig({
|
|
33
33
|
deployer: testDeployer,
|
|
34
34
|
// The highest precedent deployment
|
|
35
|
-
pepper: "
|
|
35
|
+
pepper: "devnet",
|
|
36
36
|
quoteVerifier: new FakeQuoteVerifier()
|
|
37
37
|
});
|
|
38
38
|
IOwnable(address(proxy)).transferOwnership(owner);
|