From ea8309898be73963c6a80af1e079669aeabab9e7 Mon Sep 17 00:00:00 2001 From: Keefer Taylor Date: Tue, 25 May 2021 12:56:32 -0400 Subject: [PATCH 1/2] prep for rehearsal --- deploy/src/deploy-edonet.ts | 282 +++++++++++++++++++----------------- 1 file changed, 149 insertions(+), 133 deletions(-) diff --git a/deploy/src/deploy-edonet.ts b/deploy/src/deploy-edonet.ts index 41d6429..aeacb4e 100644 --- a/deploy/src/deploy-edonet.ts +++ b/deploy/src/deploy-edonet.ts @@ -157,7 +157,7 @@ const deploy = async (): Promise => { const tokenDeployResult = await deployBreakGlass(CONTRACTS.TEST.TOKEN, daoAddress, multisigAddress, breakGlassContract, keystore, counter, nodeUrl) console.log('') - console.log('>>> [8/11] Deploying Break Glass for Liquidity POol') + console.log('>>> [8/11] Deploying Break Glass for Liquidity Pool') counter++ const liquidityPoolResult = await deployBreakGlass(CONTRACTS.TEST.LIQUIDITY_POOL, daoAddress, multisigAddress, liquidityPoolBreakGlassContract, keystore, counter, nodeUrl) console.log('') @@ -192,146 +192,162 @@ const deploy = async (): Promise => { console.log('------------------------------------------------------') console.log('>> Deploy Complete!') - console.log('>> Wiring break glasses as governors...') - console.log('------------------------------------------------------') - console.log('') - - console.log('>>> [1/11] Setting Governor for Developer Fund') - counter++ - await sendOperation(CONTRACTS.TEST.DEVELOPER_FUND, 'setGovernorContract', `"${developerFundDeployResult.contractAddress}"`, keystore, counter, nodeUrl) - console.log('') - - console.log('>>> [2/11] Setting Governor for Oracle') - counter++ - await sendOperation(CONTRACTS.TEST.ORACLE, 'setGovernorContract', `"${oracleDeployResult.contractAddress}"`, keystore, counter, nodeUrl) - console.log('') - - console.log('>>> [3/11] Setting Governor for Oven Factory') - counter++ - await sendOperation(CONTRACTS.TEST.OVEN_FACTORY, 'setGovernorContract', `"${ovenFactoryDeployResult.contractAddress}"`, keystore, counter, nodeUrl) - console.log('') - - console.log('>>> [4/11] Setting Governor for Oven Proxy') - counter++ - await sendOperation(CONTRACTS.TEST.OVEN_PROXY, 'setGovernorContract', `"${ovenProxyDeployResult.contractAddress}"`, keystore, counter, nodeUrl) - console.log('') - - console.log('>>> [5/11] Setting Governor for Oven Registry') - counter++ - await sendOperation(CONTRACTS.TEST.OVEN_REGISTRY, 'setGovernorContract', `"${ovenRegistryDeployResult.contractAddress}"`, keystore, counter, nodeUrl) - console.log('') - - console.log('>>> [6/11] Setting Governor for Stability Fund') - counter++ - await sendOperation(CONTRACTS.TEST.STABILITY_FUND, 'setGovernorContract', `"${stabilityFundDeployResult.contractAddress}"`, keystore, counter, nodeUrl) - console.log('') - - console.log('>>> [7/11] Setting Governor for Token') - counter++ - await sendOperation(CONTRACTS.TEST.TOKEN, 'setGovernorContract', `"${tokenDeployResult.contractAddress}"`, keystore, counter, nodeUrl) - console.log('') - - console.log('>>> [8/11] Setting Governor for Liquidity Pool') - counter++ - await sendOperation(CONTRACTS.TEST.LIQUIDITY_POOL, 'updateGovernorAddress', `"${liquidityPoolResult.contractAddress}"`, keystore, counter, nodeUrl) - console.log('') - - console.log('>>> [9/11] Setting Governor for Community Fund') - counter++ - await sendOperation(CONTRACTS.TEST.COMMUNITY_FUND, 'setGovernorContract', `"${communityFundResult.contractAddress}"`, keystore, counter, nodeUrl) - console.log('') - - console.log('>>> [10/11] Setting Governor for Vesting Contracts') - for (var i = 0; i < CONTRACTS.TEST.VESTING_VAULTS.length; i++) { - const vestingContract = CONTRACTS.TEST.VESTING_VAULTS[i] - const vestingResult = vestingResults[i] - - counter++ - await sendOperation(vestingContract, 'setGovernorContract', `"${vestingResult}"`, keystore, counter, nodeUrl) - } - console.log('') - - console.log('>>> [11/11] Setting Governor for Minter') - counter++ - const minterParamStorage = `Pair "${minterBreakGlassDeployResult.contractAddress}" ("${CONTRACTS.TEST.TOKEN}" ("${CONTRACTS.TEST.OVEN_PROXY}" ("${CONTRACTS.TEST.STABILITY_FUND}" "${CONTRACTS.TEST.DEVELOPER_FUND}")))` - await sendOperation(CONTRACTS.TEST.MINTER, 'updateContracts', minterParamStorage, keystore, counter, nodeUrl) - console.log('') + // console.log('>> Wiring break glasses as governors...') + // console.log('------------------------------------------------------') + // console.log('') + + // console.log('>>> [1/11] Setting Governor for Developer Fund') + // counter++ + // await sendOperation(CONTRACTS.TEST.DEVELOPER_FUND, 'setGovernorContract', `"${developerFundDeployResult.contractAddress}"`, keystore, counter, nodeUrl) + // console.log('') + + // console.log('>>> [2/11] Setting Governor for Oracle') + // counter++ + // await sendOperation(CONTRACTS.TEST.ORACLE, 'setGovernorContract', `"${oracleDeployResult.contractAddress}"`, keystore, counter, nodeUrl) + // console.log('') + + // console.log('>>> [3/11] Setting Governor for Oven Factory') + // counter++ + // await sendOperation(CONTRACTS.TEST.OVEN_FACTORY, 'setGovernorContract', `"${ovenFactoryDeployResult.contractAddress}"`, keystore, counter, nodeUrl) + // console.log('') + + // console.log('>>> [4/11] Setting Governor for Oven Proxy') + // counter++ + // await sendOperation(CONTRACTS.TEST.OVEN_PROXY, 'setGovernorContract', `"${ovenProxyDeployResult.contractAddress}"`, keystore, counter, nodeUrl) + // console.log('') + + // console.log('>>> [5/11] Setting Governor for Oven Registry') + // counter++ + // await sendOperation(CONTRACTS.TEST.OVEN_REGISTRY, 'setGovernorContract', `"${ovenRegistryDeployResult.contractAddress}"`, keystore, counter, nodeUrl) + // console.log('') + + // console.log('>>> [6/11] Setting Governor for Stability Fund') + // counter++ + // await sendOperation(CONTRACTS.TEST.STABILITY_FUND, 'setGovernorContract', `"${stabilityFundDeployResult.contractAddress}"`, keystore, counter, nodeUrl) + // console.log('') + + // console.log('>>> [7/11] Setting Governor for Token') + // counter++ + // await sendOperation(CONTRACTS.TEST.TOKEN, 'setGovernorContract', `"${tokenDeployResult.contractAddress}"`, keystore, counter, nodeUrl) + // console.log('') + + // console.log('>>> [8/11] Setting Governor for Liquidity Pool') + // counter++ + // await sendOperation(CONTRACTS.TEST.LIQUIDITY_POOL, 'updateGovernorAddress', `"${liquidityPoolResult.contractAddress}"`, keystore, counter, nodeUrl) + // console.log('') + + // console.log('>>> [9/11] Setting Governor for Community Fund') + // counter++ + // await sendOperation(CONTRACTS.TEST.COMMUNITY_FUND, 'setGovernorContract', `"${communityFundResult.contractAddress}"`, keystore, counter, nodeUrl) + // console.log('') + + // console.log('>>> [10/11] Setting Governor for Vesting Contracts') + // for (var i = 0; i < CONTRACTS.TEST.VESTING_VAULTS.length; i++) { + // const vestingContract = CONTRACTS.TEST.VESTING_VAULTS[i] + // const vestingResult = vestingResults[i] + + // counter++ + // await sendOperation(vestingContract, 'setGovernorContract', `"${vestingResult}"`, keystore, counter, nodeUrl) + // } + // console.log('') + + // console.log('>>> [11/11] Setting Governor for Minter') + // counter++ + // const minterParamStorage = `Pair "${minterBreakGlassDeployResult.contractAddress}" ("${CONTRACTS.TEST.TOKEN}" ("${CONTRACTS.TEST.OVEN_PROXY}" ("${CONTRACTS.TEST.STABILITY_FUND}" "${CONTRACTS.TEST.DEVELOPER_FUND}")))` + // await sendOperation(CONTRACTS.TEST.MINTER, 'updateContracts', minterParamStorage, keystore, counter, nodeUrl) + // console.log('') + + // console.log('------------------------------------------------------') + // console.log('>> Wiring Complete!') + // console.log('>> Breaking Glass...') + // console.log('------------------------------------------------------') + // console.log('') + + // const interestingHashes: Array = [] + + // console.log('>>> [1/11] Breaking Glass for Developer Fund') + // counter++ + // interestingHashes.push(await sendOperation(developerFundDeployResult.contractAddress, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) + // console.log('') + + // console.log('>>> [2/11] Breaking Glass for Oracle') + // counter++ + // interestingHashes.push(await sendOperation(oracleDeployResult.contractAddress, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) + // console.log('') + + // console.log('>>> [3/11] Breaking Glass for Oven Factory') + // counter++ + // interestingHashes.push(await sendOperation(ovenFactoryDeployResult.contractAddress, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) + // console.log('') + + // console.log('>>> [4/11] Breaking Glass for Oven Proxy') + // counter++ + // interestingHashes.push(await sendOperation(ovenProxyDeployResult.contractAddress, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) + // console.log('') + + // console.log('>>> [5/11] Breaking Glass for Oven Registry') + // counter++ + // interestingHashes.push(await sendOperation(ovenRegistryDeployResult.contractAddress, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) + // console.log('') + + // console.log('>>> [6/11] Breaking Glass for Stability Fund') + // counter++ + // interestingHashes.push(await sendOperation(stabilityFundDeployResult.contractAddress, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) + // console.log('') + + // console.log('>>> [7/11] Breaking Glass for Token') + // counter++ + // interestingHashes.push(await sendOperation(tokenDeployResult.contractAddress, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) + // console.log('') + + // console.log('>>> [8/11] Breaking Glass for Liquidity Pool') + // counter++ + // interestingHashes.push(await sendOperation(liquidityPoolResult.contractAddress, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) + // console.log('') + + // console.log('>>> [9/11] Breaking Glass for Community Fund') + // counter++ + // interestingHashes.push(await sendOperation(communityFundResult.contractAddress, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) + // console.log('') + + // console.log('>>> [10/11] Breaking Glass for Vesting Contracts') + // for (var i = 0; i < CONTRACTS.TEST.VESTING_VAULTS.length; i++) { + // const vestingBreakGlass = vestingResults[i] + + // counter++ + // interestingHashes.push(await sendOperation(vestingBreakGlass, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) + // } + // console.log('') + + // console.log('>>> [11/11] Breaking Glass for Minter') + // counter++ + // const minterBreakGlassParam = `Pair "${multisigAddress}" (Pair "${CONTRACTS.TEST.TOKEN}" (Pair "${CONTRACTS.TEST.OVEN_PROXY}" (Pair "${CONTRACTS.TEST.STABILITY_FUND}" "${CONTRACTS.TEST.DEVELOPER_FUND}")))` + // interestingHashes.push(await sendOperation(minterBreakGlassDeployResult.contractAddress, "breakGlass", minterBreakGlassParam, keystore, counter, nodeUrl)) + // console.log('') console.log('------------------------------------------------------') - console.log('>> Wiring Complete!') - console.log('>> Breaking Glass...') + console.log('> Success!') console.log('------------------------------------------------------') console.log('') - const interestingHashes: Array = [] + console.log(`Developer Fund: ${developerFundDeployResult.contractAddress}`) + console.log(`Minter: ${minterBreakGlassDeployResult.contractAddress}`) + console.log(`Oracle: ${oracleDeployResult.contractAddress}`) + console.log(`Oven Factor: ${ovenFactoryDeployResult.contractAddress}`) + console.log(`Oven Proxy: ${ovenProxyDeployResult.contractAddress}`) + console.log(`Oven Registry: ${ovenRegistryDeployResult.contractAddress}`) + console.log(`Stability Fund: ${stabilityFundDeployResult.contractAddress}`) + console.log(`Token: ${tokenDeployResult.contractAddress}`) - console.log('>>> [1/11] Breaking Glass for Developer Fund') - counter++ - interestingHashes.push(await sendOperation(developerFundDeployResult.contractAddress, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) - console.log('') - - console.log('>>> [2/11] Breaking Glass for Oracle') - counter++ - interestingHashes.push(await sendOperation(oracleDeployResult.contractAddress, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) - console.log('') - - console.log('>>> [3/11] Breaking Glass for Oven Factory') - counter++ - interestingHashes.push(await sendOperation(ovenFactoryDeployResult.contractAddress, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) - console.log('') - - console.log('>>> [4/11] Breaking Glass for Oven Proxy') - counter++ - interestingHashes.push(await sendOperation(ovenProxyDeployResult.contractAddress, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) - console.log('') - - console.log('>>> [5/11] Breaking Glass for Oven Registry') - counter++ - interestingHashes.push(await sendOperation(ovenRegistryDeployResult.contractAddress, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) - console.log('') - - console.log('>>> [6/11] Breaking Glass for Stability Fund') - counter++ - interestingHashes.push(await sendOperation(stabilityFundDeployResult.contractAddress, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) - console.log('') - - console.log('>>> [7/11] Breaking Glass for Token') - counter++ - interestingHashes.push(await sendOperation(tokenDeployResult.contractAddress, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) - console.log('') + console.log(`Liquidity Pool: ${liquidityPoolResult.contractAddress}`) - console.log('>>> [8/11] Breaking Glass for Liquidity Pool') - counter++ - interestingHashes.push(await sendOperation(liquidityPoolResult.contractAddress, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) - console.log('') - - console.log('>>> [9/11] Breaking Glass for Community Fund') - counter++ - interestingHashes.push(await sendOperation(communityFundResult.contractAddress, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) - console.log('') - - console.log('>>> [10/11] Breaking Glass for Vesting Contracts') - for (var i = 0; i < CONTRACTS.TEST.VESTING_VAULTS.length; i++) { - const vestingBreakGlass = vestingResults[i] - - counter++ - interestingHashes.push(await sendOperation(vestingBreakGlass, 'breakGlass', `"${multisigAddress}"`, keystore, counter, nodeUrl)) - } - console.log('') - - console.log('>>> [11/11] Breaking Glass for Minter') - counter++ - const minterBreakGlassParam = `Pair "${multisigAddress}" (Pair "${CONTRACTS.TEST.TOKEN}" (Pair "${CONTRACTS.TEST.OVEN_PROXY}" (Pair "${CONTRACTS.TEST.STABILITY_FUND}" "${CONTRACTS.TEST.DEVELOPER_FUND}")))` - interestingHashes.push(await sendOperation(minterBreakGlassDeployResult.contractAddress, "breakGlass", minterBreakGlassParam, keystore, counter, nodeUrl)) - console.log('') - - console.log('------------------------------------------------------') - console.log('> Success!') - console.log('------------------------------------------------------') - console.log('') + console.log(`Comm Fund: ${communityFundResult.contractAddress}`) + console.log(`Vault 1: ${vestingResults[0]}`) + console.log(`Vault 2: ${vestingResults[0]}`) + console.log(`Vault 3: ${vestingResults[0]}`) - console.log('> Break Glass Hashes') - console.log(JSON.stringify(interestingHashes)) + // console.log('> Break Glass Hashes') + // console.log(JSON.stringify(interestingHashes)) console.log('') } From 819b5b202fe78a1546b6853828684e31692e7b61 Mon Sep 17 00:00:00 2001 From: Keefer Taylor Date: Tue, 25 May 2021 13:15:10 -0400 Subject: [PATCH 2/2] more rehearsal --- deploy/package-lock.json | 204 ------------------------------------ deploy/src/deploy-edonet.ts | 25 +++-- 2 files changed, 12 insertions(+), 217 deletions(-) diff --git a/deploy/package-lock.json b/deploy/package-lock.json index ecd3350..f9ed74e 100644 --- a/deploy/package-lock.json +++ b/deploy/package-lock.json @@ -1818,9 +1818,6 @@ "punycode": "^2.1.0" } }, - "node_modules/ansi-escapes": { - "dev": true - }, "node_modules/ansi-regex": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", @@ -2150,9 +2147,6 @@ "semver": "bin/semver.js" } }, - "node_modules/babel-plugin-istanbul": { - "dev": true - }, "node_modules/babel-preset-jest": { "version": "26.6.2", "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz", @@ -3976,10 +3970,6 @@ "node": ">=0.10.0" } }, - "node_modules/events": {}, - "node_modules/exec-sh": { - "dev": true - }, "node_modules/execa": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", @@ -4053,9 +4043,6 @@ "node": ">=0.10.0" } }, - "node_modules/exit": { - "dev": true - }, "node_modules/expand-brackets": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", @@ -4277,9 +4264,6 @@ "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", "dev": true }, - "node_modules/fast-json-stable-stringify": { - "dev": true - }, "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", @@ -4385,7 +4369,6 @@ "node": "*" } }, - "node_modules/form-data": {}, "node_modules/fragment-cache": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", @@ -4553,9 +4536,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/globby": { - "dev": true - }, "node_modules/graceful-fs": { "version": "4.2.6", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", @@ -5128,21 +5108,6 @@ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, - "node_modules/istanbul-lib-coverage": { - "dev": true - }, - "node_modules/istanbul-lib-instrument": { - "dev": true - }, - "node_modules/istanbul-lib-report": { - "dev": true - }, - "node_modules/istanbul-lib-source-maps": { - "dev": true - }, - "node_modules/istanbul-reports": { - "dev": true - }, "node_modules/jest": { "version": "26.5.0", "resolved": "https://registry.npmjs.org/jest/-/jest-26.5.0.tgz", @@ -5160,9 +5125,6 @@ "node": ">= 10.14.2" } }, - "node_modules/jest-changed-files": { - "dev": true - }, "node_modules/jest-cli": { "version": "26.6.3", "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz", @@ -5329,9 +5291,6 @@ "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", "dev": true }, - "node_modules/jest-config": { - "dev": true - }, "node_modules/jest-diff": { "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz", @@ -5482,9 +5441,6 @@ "node": ">= 10.14.2" } }, - "node_modules/jest-haste-map": { - "dev": true - }, "node_modules/jest-jasmine2": { "version": "26.6.3", "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz", @@ -5807,12 +5763,6 @@ "node": ">= 10.14.2" } }, - "node_modules/jest-message-util": { - "dev": true - }, - "node_modules/jest-mock": { - "dev": true - }, "node_modules/jest-pnp-resolver": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz", @@ -5830,21 +5780,6 @@ } } }, - "node_modules/jest-regex-util": { - "dev": true - }, - "node_modules/jest-resolve": { - "dev": true - }, - "node_modules/jest-resolve-dependencies": { - "dev": true - }, - "node_modules/jest-runner": { - "dev": true - }, - "node_modules/jest-runtime": { - "dev": true - }, "node_modules/jest-serializer": { "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz", @@ -5858,21 +5793,6 @@ "node": ">= 10.14.2" } }, - "node_modules/jest-snapshot": { - "dev": true - }, - "node_modules/jest-util": { - "dev": true - }, - "node_modules/jest-validate": { - "dev": true - }, - "node_modules/jest-watcher": { - "dev": true - }, - "node_modules/jest-worker": { - "dev": true - }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6317,9 +6237,6 @@ "node": "*" } }, - "node_modules/minimist": { - "dev": true - }, "node_modules/mixin-deep": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", @@ -6463,17 +6380,12 @@ "node-gyp-build-test": "build-test.js" } }, - "node_modules/node-hid": {}, "node_modules/node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=", "dev": true }, - "node_modules/node-notifier": { - "dev": true, - "optional": true - }, "node_modules/normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -6865,9 +6777,6 @@ "node": ">=0.10.0" } }, - "node_modules/pirates": { - "dev": true - }, "node_modules/pkg-up": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-1.0.0.tgz", @@ -7382,7 +7291,6 @@ "inherits": "^2.0.1" } }, - "node_modules/rxjs": {}, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -7789,9 +7697,6 @@ "node": ">=0.10.0" } }, - "node_modules/source-map": { - "dev": true - }, "node_modules/source-map-resolve": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", @@ -8307,9 +8212,6 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, - "node_modules/tsutils": { - "dev": true - }, "node_modules/tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -8384,7 +8286,6 @@ "deprecated": "Please see https://github.com/lydell/urix#deprecated", "dev": true }, - "node_modules/usb": {}, "node_modules/use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", @@ -8413,9 +8314,6 @@ "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", "dev": true }, - "node_modules/v8-to-istanbul": { - "dev": true - }, "node_modules/validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -10152,9 +10050,6 @@ } } }, - "ansi-escapes": { - "dev": true - }, "ansi-regex": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", @@ -10405,9 +10300,6 @@ } } }, - "babel-plugin-istanbul": { - "dev": true - }, "babel-preset-jest": { "version": "26.6.2", "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz", @@ -11860,10 +11752,6 @@ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true }, - "events": {}, - "exec-sh": { - "dev": true - }, "execa": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", @@ -11921,9 +11809,6 @@ } } }, - "exit": { - "dev": true - }, "expand-brackets": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", @@ -12105,9 +11990,6 @@ "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", "dev": true }, - "fast-json-stable-stringify": { - "dev": true - }, "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", @@ -12183,7 +12065,6 @@ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, - "form-data": {}, "fragment-cache": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", @@ -12304,9 +12185,6 @@ } } }, - "globby": { - "dev": true - }, "graceful-fs": { "version": "4.2.6", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", @@ -12755,21 +12633,6 @@ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, - "istanbul-lib-coverage": { - "dev": true - }, - "istanbul-lib-instrument": { - "dev": true - }, - "istanbul-lib-report": { - "dev": true - }, - "istanbul-lib-source-maps": { - "dev": true - }, - "istanbul-reports": { - "dev": true - }, "jest": { "version": "26.5.0", "resolved": "https://registry.npmjs.org/jest/-/jest-26.5.0.tgz", @@ -12781,9 +12644,6 @@ "jest-cli": "^26.5.0" } }, - "jest-changed-files": { - "dev": true - }, "jest-cli": { "version": "26.6.3", "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz", @@ -12913,9 +12773,6 @@ } } }, - "jest-config": { - "dev": true - }, "jest-diff": { "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz", @@ -13042,9 +12899,6 @@ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz", "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==" }, - "jest-haste-map": { - "dev": true - }, "jest-jasmine2": { "version": "26.6.3", "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz", @@ -13305,12 +13159,6 @@ "pretty-format": "^26.6.2" } }, - "jest-message-util": { - "dev": true - }, - "jest-mock": { - "dev": true - }, "jest-pnp-resolver": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz", @@ -13318,21 +13166,6 @@ "dev": true, "requires": {} }, - "jest-regex-util": { - "dev": true - }, - "jest-resolve": { - "dev": true - }, - "jest-resolve-dependencies": { - "dev": true - }, - "jest-runner": { - "dev": true - }, - "jest-runtime": { - "dev": true - }, "jest-serializer": { "version": "26.6.2", "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz", @@ -13343,21 +13176,6 @@ "graceful-fs": "^4.2.4" } }, - "jest-snapshot": { - "dev": true - }, - "jest-util": { - "dev": true - }, - "jest-validate": { - "dev": true - }, - "jest-watcher": { - "dev": true - }, - "jest-worker": { - "dev": true - }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -13726,9 +13544,6 @@ "brace-expansion": "^1.1.7" } }, - "minimist": { - "dev": true - }, "mixin-deep": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", @@ -13839,17 +13654,12 @@ "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.3.tgz", "integrity": "sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==" }, - "node-hid": {}, "node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=", "dev": true }, - "node-notifier": { - "dev": true, - "optional": true - }, "normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -14155,9 +13965,6 @@ "pinkie": "^2.0.0" } }, - "pirates": { - "dev": true - }, "pkg-up": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-1.0.0.tgz", @@ -14554,7 +14361,6 @@ "inherits": "^2.0.1" } }, - "rxjs": {}, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -14881,9 +14687,6 @@ } } }, - "source-map": { - "dev": true - }, "source-map-resolve": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", @@ -15299,9 +15102,6 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, - "tsutils": { - "dev": true - }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -15356,7 +15156,6 @@ "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", "dev": true }, - "usb": {}, "use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", @@ -15379,9 +15178,6 @@ "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", "dev": true }, - "v8-to-istanbul": { - "dev": true - }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", diff --git a/deploy/src/deploy-edonet.ts b/deploy/src/deploy-edonet.ts index aeacb4e..1f858fe 100644 --- a/deploy/src/deploy-edonet.ts +++ b/deploy/src/deploy-edonet.ts @@ -5,26 +5,26 @@ import { KeyStore, TezosNodeReader } from 'conseiljs' const CONTRACTS = { TEST: { // Kolibri Contracts - DEVELOPER_FUND: 'KT1UdVpxcdTF9RNF9qC6DGu3XF56vc3ciabk', - MINTER: 'KT1FrAHTBboRCPh2osRP4ThNdEQRzgkqAd79', - ORACLE: 'KT1X3Grb3j6xVD2yejdbHnVTWRE4NA2tyszM', - OVEN_FACTORY: 'KT1VTHtbpktrybvERKN8jbAcMUXXZRfvZ5Sd', - OVEN_PROXY: 'KT194yN9aZeUuC1YMhyCA2KcXNiSbRQL7Pqr', - OVEN_REGISTRY: 'KT19NJHDViPacRfJkWjgK3pWPG4xiyamQ6Ht', - STABILITY_FUND: 'KT1AcdJjeG96zGTVfAKswKzrJBdTRwV9Ca5Y', - TOKEN: 'KT1WchDzW7rzdAf2TBfQfTgvabLKSn2XJtkb', + DEVELOPER_FUND: 'KT1GaoN7QJf6BTBdAbBU4Sn2HkKBURYiKdWw', + MINTER: 'KT1XRZcTtAMSona8scisWHMqjS1mPY9MYgAs', + ORACLE: 'KT1Sf2MED2gU2tweMYaq7W9eoUgWZ5Fbxpdm', + OVEN_FACTORY: 'KT1DzoRyZi5EH4RRutBLiFbfQiXVzUZPp2mz', + OVEN_PROXY: 'KT1SaLAE26yfEZNWDeMguHGynULz4MbXoo7i', + OVEN_REGISTRY: 'KT1NCBuKhGcBbQUPegZV87NweGN6EyYotGUR', + STABILITY_FUND: 'KT1EED1wfZcYS796kCm5qUDf3fngxSF67gRR', + TOKEN: 'KT1TYGatFGXccm23ctedPScmkJZQjUN8n4iK', // Liquidity Pool - LIQUIDITY_POOL: 'KT1VLkQDbKg6sfz1M5p33grRFUbC3B76tUtt', + LIQUIDITY_POOL: 'KT1JRapghAvX1V8AC1gGmBZz9xMBQtG1rvFT', // Murmuration Contracts - COMMUNITY_FUND: 'KT1KrUuPe5RMZjHWg4tow8Un6ppsW4gHgGuC', - VESTING_VAULTS: ['KT1S56jqhZePm4GCRcvv1hBwTGFbLK8EPJAj', 'KT19ouGreMy6Gfo1beq77RP8d1nh31RxdBGM', 'KT1VdJuWV1jsYKTyKsvr2GifmYmQphwAFJvG'], + COMMUNITY_FUND: 'KT1AJHX385bqnJCVpz7YLUicuMhnXPkU3Gpz', + VESTING_VAULTS: ['KT1VY3EbRDrPu1Z1UWhKxiUJK7BkFik8ieXF', 'KT1KpmCkRX1tEeeVhPH6EhMW6bsBroW9Ru6e', 'KT1VdJuWV1jsYKTyKsvr2GifmYmQphwAFJvG'], } } const daoAddress = 'KT1WebnFBXa33G3AoA5zC7eMyJjmuFJqCCCb' - +const multisigAddress = '' // Load secret key const privateKeyName = 'BREAK_GLASS_SK' @@ -120,7 +120,6 @@ const deploy = async (): Promise => { console.log('------------------------------------------------------') console.log('') - const multisigAddress = keystore.publicKeyHash console.log('>>> [1/11] Deploying Break Glass for Developer Fund') counter++