Skip to content
This repository was archived by the owner on May 28, 2022. It is now read-only.

Commit 9e7a54b

Browse files
anna-carrollanna-carroll
committed
rename scripts into sub-folder of governance
1 parent 47baae6 commit 9e7a54b

File tree

11 files changed

+48
-68
lines changed

11 files changed

+48
-68
lines changed

typescript/nomad-deploy/scripts/development/governance/checkNewChain.ts renamed to typescript/nomad-deploy/scripts/development/governance/enroll-kovan/checkNewChain.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import * as rinkeby from '../../../config/testnets/rinkeby';
2-
import * as kovan from '../../../config/testnets/kovan';
3-
import { ExistingCoreDeploy } from '../../../src/core/CoreDeploy';
4-
import { ExistingBridgeDeploy } from '../../../src/bridge/BridgeDeploy';
5-
import { getPathToDeployConfig } from '../../../src/verification/readDeployOutput';
6-
import { deploysToSDK } from '../../../src/incremental/utils';
7-
import { checkHubAndSpokeConnections } from '../../../src/incremental/checks';
1+
import * as rinkeby from '../../../../config/testnets/rinkeby';
2+
import * as kovan from '../../../../config/testnets/kovan';
3+
import { ExistingCoreDeploy } from '../../../../src/core/CoreDeploy';
4+
import { ExistingBridgeDeploy } from '../../../../src/bridge/BridgeDeploy';
5+
import { getPathToDeployConfig } from '../../../../src/verification/readDeployOutput';
6+
import { deploysToSDK } from '../../../../src/governance/utils';
7+
import { checkHubAndSpokeConnections } from '../../../../src/governance/enrollChain/checks';
88
import { NomadContext } from '@nomad-xyz/sdk';
99

1010
const path = getPathToDeployConfig('dev');

typescript/nomad-deploy/scripts/development/governance/deployNewBridge.ts renamed to typescript/nomad-deploy/scripts/development/governance/enroll-kovan/deployNewBridge.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import * as rinkeby from '../../../config/testnets/rinkeby';
2-
import * as kovan from '../../../config/testnets/kovan';
1+
import * as rinkeby from '../../../../config/testnets/rinkeby';
2+
import * as kovan from '../../../../config/testnets/kovan';
33
import {
44
BridgeDeploy,
55
ExistingBridgeDeploy,
6-
} from '../../../src/bridge/BridgeDeploy';
7-
import { deployNewChainBridge } from '../../../src/bridge';
8-
import { getPathToDeployConfig } from '../../../src/verification/readDeployOutput';
6+
} from '../../../../src/bridge/BridgeDeploy';
7+
import { deployNewChainBridge } from '../../../../src/bridge';
8+
import { getPathToDeployConfig } from '../../../../src/verification/readDeployOutput';
99

1010
const path = getPathToDeployConfig('dev');
1111

typescript/nomad-deploy/scripts/development/governance/deployNewCore.ts renamed to typescript/nomad-deploy/scripts/development/governance/enroll-kovan/deployNewCore.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import * as rinkeby from '../../../config/testnets/rinkeby';
2-
import * as kovan from '../../../config/testnets/kovan';
3-
import * as moonbasealpha from '../../../config/testnets/moonbasealpha';
4-
import { CoreDeploy, ExistingCoreDeploy } from '../../../src/core/CoreDeploy';
5-
import { deployNewChain } from '../../../src/core';
6-
import { getPathToDeployConfig } from '../../../src/verification/readDeployOutput';
1+
import * as rinkeby from '../../../../config/testnets/rinkeby';
2+
import * as kovan from '../../../../config/testnets/kovan';
3+
import * as moonbasealpha from '../../../../config/testnets/moonbasealpha';
4+
import { CoreDeploy, ExistingCoreDeploy } from '../../../../src/core/CoreDeploy';
5+
import { deployNewChain } from '../../../../src/core';
6+
import { getPathToDeployConfig } from '../../../../src/verification/readDeployOutput';
77

88
const path = getPathToDeployConfig('dev');
99

typescript/nomad-deploy/scripts/development/governance/enrollNewChain.ts renamed to typescript/nomad-deploy/scripts/development/governance/enroll-kovan/enrollNewChain.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import * as rinkeby from '../../../config/testnets/rinkeby';
2-
import * as kovan from '../../../config/testnets/kovan';
3-
import { ExistingCoreDeploy } from '../../../src/core/CoreDeploy';
4-
import { ExistingBridgeDeploy } from '../../../src/bridge/BridgeDeploy';
5-
import { getPathToDeployConfig } from '../../../src/verification/readDeployOutput';
6-
import { deploysToSDK } from '../../../src/incremental/utils';
7-
import { enrollSpoke } from '../../../src/incremental';
1+
import * as rinkeby from '../../../../config/testnets/rinkeby';
2+
import * as kovan from '../../../../config/testnets/kovan';
3+
import { ExistingCoreDeploy } from '../../../../src/core/CoreDeploy';
4+
import { ExistingBridgeDeploy } from '../../../../src/bridge/BridgeDeploy';
5+
import { getPathToDeployConfig } from '../../../../src/verification/readDeployOutput';
6+
import { deploysToSDK } from '../../../../src/governance/utils';
7+
import { enrollSpoke } from '../../../../src/governance/enrollChain';
88
import { NomadContext } from '@nomad-xyz/sdk';
99

1010
const path = getPathToDeployConfig('dev');
@@ -45,4 +45,4 @@ sdkCores.forEach((core) => {
4545
});
4646

4747
// enroll spoke then check enrollment
48-
enrollSpoke(sdk, kovanDomain.id, kovan.devConfig);
48+
enrollSpoke(sdk, kovanCoreDeploy);

‎typescript/nomad-deploy/scripts/local/connect.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import * as tom from '../../config/local/tom';
22
import * as daffy from '../../config/local/jerry';
3-
import { enrollSpoke } from '../../src/incremental';
4-
import { deploysToSDK } from '../../src/incremental/utils';
3+
import { enrollSpoke } from '../../src/governance/enrollChain';
4+
import { checkHubToSpokeConnectionWithWaiter } from '../../src/governance/enrollChain/checks';
5+
import { deploysToSDK } from '../../src/governance/utils';
56
import { getPathToDeployConfig } from '../../src/verification/readDeployOutput';
67
import { ExistingCoreDeploy } from '../../src/core/CoreDeploy';
78
import { ExistingBridgeDeploy } from '../../src/bridge/BridgeDeploy';
89
import { NomadContext } from '@nomad-xyz/sdk';
9-
import { checkHubToSpokeConnectionWithWaiter } from '../../src/incremental/checks';
1010

1111
const path = getPathToDeployConfig('dev');
1212

@@ -44,7 +44,7 @@ const sdk = NomadContext.fromDomains([tomDomain, daffyDomain]);
4444
});
4545

4646
(async () => {
47-
await enrollSpoke(sdk, daffyDomain.id, daffy.devConfig);
47+
await enrollSpoke(sdk, daffyCoreDeploy);
4848
await checkHubToSpokeConnectionWithWaiter(
4949
sdk,
5050
daffyDomain.id,

‎typescript/nomad-deploy/scripts/staging/governance/checkNewChain.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import * as kovan from '../../../config/testnets/kovan';
33
import { ExistingCoreDeploy } from '../../../src/core/CoreDeploy';
44
import { ExistingBridgeDeploy } from '../../../src/bridge/BridgeDeploy';
55
import { getPathToDeployConfig } from '../../../src/verification/readDeployOutput';
6-
import { deploysToSDK } from '../../../src/incremental/utils';
7-
import { checkHubAndSpokeConnections } from '../../../src/incremental/checks';
6+
import { deploysToSDK } from '../../../src/governance/utils';
7+
import { checkHubAndSpokeConnections } from '../../../src/governance/enrollChain/checks';
88
import { NomadContext } from '@nomad-xyz/sdk';
99

1010
const path = getPathToDeployConfig('staging');

‎typescript/nomad-deploy/scripts/staging/governance/enrollNewChain.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import * as kovan from '../../../config/testnets/kovan';
33
import { ExistingCoreDeploy } from '../../../src/core/CoreDeploy';
44
import { ExistingBridgeDeploy } from '../../../src/bridge/BridgeDeploy';
55
import { getPathToDeployConfig } from '../../../src/verification/readDeployOutput';
6-
import { deploysToSDK } from '../../../src/incremental/utils';
7-
import { enrollSpoke } from '../../../src/incremental';
6+
import { deploysToSDK } from '../../../src/governance/utils';
7+
import { enrollSpoke } from '../../../src/governance/enrollChain';
88
import { NomadContext } from '@nomad-xyz/sdk';
99

1010
const path = getPathToDeployConfig('staging');
@@ -46,4 +46,4 @@ sdkCores.map((core) => {
4646
});
4747

4848
// enroll spoke
49-
enrollSpoke(sdk, kovanDomain.id, kovan.stagingConfig);
49+
enrollSpoke(sdk, kovanCoreDeploy);

typescript/nomad-deploy/src/incremental/checks.ts renamed to typescript/nomad-deploy/src/governance/enrollChain/checks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { NomadContext } from '@nomad-xyz/sdk/';
22
import { expect, AssertionError } from 'chai';
3-
import { Waiter } from './utils';
3+
import { Waiter } from '../utils';
44

55
export async function checkHubAndSpokeConnections(sdk: NomadContext, spokeDomain: number, watchers: string[]) {
66
let hubCore = await sdk.governorCore();

typescript/nomad-deploy/src/incremental/index.ts renamed to typescript/nomad-deploy/src/governance/enrollChain/index.ts

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
import { NomadContext } from '@nomad-xyz/sdk/';
2+
import { CallBatch } from '@nomad-xyz/sdk/nomad';
23
import { canonizeId } from '@nomad-xyz/sdk/utils';
3-
import { CoreConfig } from '../core/CoreDeploy';
4-
import { writeBatchOutput } from './utils';
4+
import { CoreDeploy } from '../../core/CoreDeploy';
5+
import {executeBatch} from '../';
56

67
/**
78
* Prepares and executes necessary calls to governing
89
* router for enrolling a spoke after core and
910
* bridge have been deployed
1011
* @param sdk SDK containing new spoke domain
11-
* @param spokeDomain domain of the spoke
12-
* @param watchers set of watchers to be enrolled
12+
* @param spokeDeploy the spoke CoreDeploy
1313
*/
1414
export async function enrollSpoke(
1515
sdk: NomadContext,
16-
spokeDomain: number,
17-
spokeConfig: CoreConfig,
16+
spokeDeploy: CoreDeploy,
1817
): Promise<void> {
1918
let hubCore = await sdk.governorCore();
2019
let hubBridge = sdk.mustGetBridge(hubCore.domain);
2120

21+
const {domain: spokeDomain, name} = spokeDeploy.chain;
22+
const {watchers, environment} = spokeDeploy.config;
2223
let spokeCore = await sdk.mustGetCore(spokeDomain);
2324
let spokeBridge = await sdk.mustGetBridge(spokeDomain);
24-
let batch = await hubCore.newGovernanceBatch();
25+
let batch = await CallBatch.fromContext(sdk);
2526

2627
// enroll watchers
2728
await Promise.all(
28-
spokeConfig.watchers.map(async (watcher) => {
29+
watchers.map(async (watcher) => {
2930
const call =
3031
await hubCore.xAppConnectionManager.populateTransaction.setWatcherPermission(
3132
watcher,
@@ -58,25 +59,6 @@ export async function enrollSpoke(
5859
canonizeId(spokeBridge.bridgeRouter.address),
5960
);
6061
batch.pushLocal(enrollBridgeCall);
61-
62-
if (spokeConfig.environment === 'dev') {
63-
// in dev, execute the batch directly
64-
console.log("Sending governance transaction...");
65-
const txResponse = await batch.execute();
66-
const receipt = await txResponse.wait();
67-
console.log("Governance tx mined!! ", receipt.transactionHash);
68-
} else {
69-
// in staging and prod, output batch to a file
70-
const built = await batch.build();
71-
const unbuiltStr = JSON.stringify(
72-
{ local: batch.local, remote: batch.remote },
73-
null,
74-
2,
75-
);
76-
const builtStr = JSON.stringify(built, null, 2);
77-
console.log("Writing governance transaction to file");
78-
writeBatchOutput(builtStr, unbuiltStr, spokeConfig.environment);
79-
console.log("Done!");
80-
// TODO: send to gnosis safe directly
81-
}
62+
// execute the call batch
63+
await executeBatch(batch, environment, `enroll-${name}`);
8264
}

‎typescript/nomad-deploy/src/index.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
export * as core from './core';
22
export * as bridge from './bridge';
3-
export * as incremental from './incremental';
4-
53
export * as governance from './governance';
4+
export * as incremental from './governance/enrollChain';
65
export * as deploy from './deploy';
76
export * as chain from './chain';
87
export * as contracts from './contracts';

0 commit comments

Comments
 (0)