@@ -57,10 +57,6 @@ module.exports = async function (deployer, network) {
57
57
ERC721HandlerContract ,
58
58
bridgeInstance . address
59
59
) ;
60
- const permissionedGenericHandlerInstance = await deployer . deploy (
61
- PermissionedGenericHandlerContract ,
62
- bridgeInstance . address
63
- ) ;
64
60
65
61
// deploy fee handlers
66
62
const feeRouterInstance = await deployer . deploy (
@@ -105,8 +101,6 @@ module.exports = async function (deployer, network) {
105
101
"Bridge Address" : bridgeInstance . address ,
106
102
"ERC20Handler Address" : erc20HandlerInstance . address ,
107
103
"ERC721Handler Address" : erc721HandlerInstance . address ,
108
- "PermissionedGenericHandler Address" :
109
- permissionedGenericHandlerInstance . address ,
110
104
"FeeRouterContract Address" : feeRouterInstance . address ,
111
105
"BasicFeeHandler Address" : basicFeeHandlerInstance . address ,
112
106
"DynamicFeeHandler Address" : dynamicFeeHandlerInstance . address ,
@@ -173,32 +167,52 @@ module.exports = async function (deployer, network) {
173
167
) ;
174
168
}
175
169
176
- for ( const generic of currentNetworkConfig . permissionedGeneric ) {
177
- await Utils . setupGeneric (
178
- deployer ,
179
- generic ,
180
- bridgeInstance ,
181
- permissionedGenericHandlerInstance
182
- ) ;
183
- await Utils . setupFee (
184
- networksConfig ,
185
- feeRouterInstance ,
186
- dynamicFeeHandlerInstance ,
187
- basicFeeHandlerInstance ,
188
- percentageFeeHandlerInstance ,
189
- generic
170
+ // check if permissioned generic handler should be deployed
171
+ if ( currentNetworkConfig . permissionedGeneric . length > 0 ) {
172
+ const permissionedGenericHandlerInstance = await deployer . deploy (
173
+ PermissionedGenericHandlerContract ,
174
+ bridgeInstance . address
190
175
) ;
191
176
192
- console . log (
193
- "-------------------------------------------------------------------------------"
194
- ) ;
195
- console . log ( "Generic contract address:" , "\t" , generic . address ) ;
196
- console . log ( "ResourceID:" , "\t" , generic . resourceID ) ;
197
- console . log (
198
- "-------------------------------------------------------------------------------"
199
- ) ;
177
+ for ( const generic of currentNetworkConfig . permissionedGeneric ) {
178
+ await Utils . setupGeneric (
179
+ deployer ,
180
+ generic ,
181
+ bridgeInstance ,
182
+ permissionedGenericHandlerInstance
183
+ ) ;
184
+ await Utils . setupFee (
185
+ networksConfig ,
186
+ feeRouterInstance ,
187
+ dynamicFeeHandlerInstance ,
188
+ basicFeeHandlerInstance ,
189
+ percentageFeeHandlerInstance ,
190
+ generic
191
+ ) ;
192
+
193
+ console . log (
194
+ "-------------------------------------------------------------------------------"
195
+ ) ;
196
+ console . log (
197
+ "Permissioned generic handler address:" ,
198
+ "\t" ,
199
+ permissionedGenericHandlerInstance . address
200
+ ) ;
201
+ console . log (
202
+ "Generic contract address:" ,
203
+ "\t" , generic . address
204
+ ) ;
205
+ console . log (
206
+ "ResourceID:" ,
207
+ "\t" , generic . resourceID
208
+ ) ;
209
+ console . log (
210
+ "-------------------------------------------------------------------------------"
211
+ ) ;
212
+ }
200
213
}
201
214
215
+
202
216
// set MPC address
203
217
if ( currentNetworkConfig . MPCAddress )
204
218
await bridgeInstance . endKeygen ( currentNetworkConfig . MPCAddress ) ;
0 commit comments