Skip to content

Commit c91df5a

Browse files
committed
fix ignition deployment (#364)
1 parent 27de2e1 commit c91df5a

File tree

5 files changed

+33
-140
lines changed

5 files changed

+33
-140
lines changed

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,13 @@ export SKIP_VERIFICATION=true
7272
hh run scripts/deploy_all.ts
7373
```
7474

75+
Deployment via ignition
76+
77+
```bash
78+
npx hardhat ignition deploy ignition/modules/GifCore.ts
79+
hh ignition deploy ignition/modules/GifCore.ts
80+
```
81+
7582
```bash
7683
# set appropriate values vor env variables (see below)
7784

ignition/modules/GifCore.ts

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@ export default buildModule("GifCore", (m) => {
1515
objectTypeLib,
1616
roleIdLib,
1717
secondsLib,
18+
selectorLib,
19+
selectorSetLib,
1820
stakeManagerLib,
1921
stateIdLib,
22+
strLib,
2023
targetManagerLib,
2124
timestamplib,
2225
uFixedLib,
@@ -28,11 +31,17 @@ export default buildModule("GifCore", (m) => {
2831
const dip = m.contract("Dip", []);
2932

3033
// 2) deploy registry admin
31-
const registryAdmin = m.contract("RegistryAdmin", [stakingOwner],
34+
const registryAdmin = m.contract("RegistryAdmin", [],
3235
{
3336
libraries: {
34-
TimestampLib: timestamplib,
37+
ObjectTypeLib: objectTypeLib,
3538
RoleIdLib: roleIdLib,
39+
SelectorLib: selectorLib,
40+
SelectorSetLib: selectorSetLib,
41+
StrLib: strLib,
42+
TimestampLib: timestamplib,
43+
VersionLib: versionLib,
44+
VersionPartLib: versionPartLib,
3645
},
3746
}
3847
);
@@ -54,7 +63,6 @@ export default buildModule("GifCore", (m) => {
5463
{
5564
libraries: {
5665
NftIdLib: nftIdLib,
57-
RoleIdLib: roleIdLib,
5866
SecondsLib: secondsLib,
5967
TimestampLib: timestamplib,
6068
VersionLib: versionLib,
@@ -95,6 +103,7 @@ export default buildModule("GifCore", (m) => {
95103
NftIdLib: nftIdLib,
96104
ObjectTypeLib: objectTypeLib,
97105
StateIdLib: stateIdLib,
106+
TargetManagerLib: targetManagerLib,
98107
TimestampLib: timestamplib,
99108
UFixedLib: uFixedLib,
100109
},
@@ -133,7 +142,7 @@ export default buildModule("GifCore", (m) => {
133142
});
134143

135144
// 11) initialize registry admin
136-
m.call(registryAdmin, "initialize", [registry, gifAdmin, gifManager], {
145+
m.call(registryAdmin, "completeSetup", [registry, gifAdmin, gifManager], {
137146
after: [stakingLinkToRegisteredNftId]
138147
});
139148

ignition/modules/Libraries.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
11
import { buildModule } from "@nomicfoundation/hardhat-ignition/modules";
22

33
export default buildModule("Libraries", (m) => {
4+
const selectorLib = m.library("SelectorLib");
5+
const selectorSetLib = m.library("SelectorSetLib");
46
const secondsLib = m.library("SecondsLib");
7+
const strLib = m.library("StrLib");
58
const timestamplib = m.library("TimestampLib", {
69
libraries: {
710
SecondsLib: secondsLib
811
}
912
});
1013
const key32Lib = m.library("Key32Lib");
14+
const objectTypeLib = m.library("ObjectTypeLib");
15+
const versionLib = m.library("VersionLib");
16+
const versionPartLib = m.library("VersionPartLib");
1117
const roleIdLib = m.library("RoleIdLib", {
1218
libraries: {
13-
Key32Lib: key32Lib
19+
Key32Lib: key32Lib,
20+
ObjectTypeLib: objectTypeLib,
21+
VersionPartLib: versionPartLib,
1422
},
1523
});
1624
const nftIdLib = m.library("NftIdLib", {
1725
libraries: {
1826
Key32Lib: key32Lib
1927
},
2028
});
21-
const objectTypeLib = m.library("ObjectTypeLib");
22-
const versionLib = m.library("VersionLib");
23-
const versionPartLib = m.library("VersionPartLib");
2429
const blocknumberLib = m.library("BlocknumberLib");
2530
const nftIdSetLib = m.library("LibNftIdSet");
2631
const stateIdLib = m.library("StateIdLib");
@@ -58,7 +63,10 @@ export default buildModule("Libraries", (m) => {
5863
stateIdLib,
5964
roleIdLib,
6065
secondsLib,
66+
selectorLib,
67+
selectorSetLib,
6168
stakeManagerLib,
69+
strLib,
6270
targetManagerLib,
6371
timestamplib,
6472
uFixedLib,

package-lock.json

Lines changed: 0 additions & 131 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/libs/registry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export async function deployAndInitializeRegistry(owner: Signer, libraries: Libr
8181
const { address: registryAdminAddress, contract: registryAdminBaseContract } = await deployContract(
8282
"RegistryAdmin",
8383
owner, // GIF_ADMIN_ROLE
84-
[owner],
84+
[],
8585
{
8686
libraries: {
8787
ObjectTypeLib: libraries.objectTypeLibAddress,

0 commit comments

Comments
 (0)