Skip to content

Commit

Permalink
upgrade celo deps from developer tooling repo (#10936)
Browse files Browse the repository at this point in the history
* upgrade celo deps from dt repo

* remove exchange env test. the Contract is defunkt and mento owns the replacement. no need for a test here

* exchange no longer exists so we dont need to freeze or thaw it
  • Loading branch information
aaronmgdr authored and lvpeschke committed Feb 26, 2024
1 parent c8c30f0 commit 7c60ebf
Show file tree
Hide file tree
Showing 8 changed files with 106 additions and 197 deletions.
10 changes: 5 additions & 5 deletions packages/celotool/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
"license": "Apache-2.0",
"dependencies": {
"@celo/base": "^6.0.0",
"@celo/connect": "^5.1.1",
"@celo/cryptographic-utils": "^5.0.6",
"@celo/contractkit": "^6.0.0",
"@celo/connect": "^5.1.2",
"@celo/cryptographic-utils": "^5.0.7",
"@celo/contractkit": "^7.0.0",
"@celo/env-tests": "1.0.3",
"@celo/explorer": "^5.0.7",
"@celo/governance": "^5.0.7",
"@celo/explorer": "^5.0.8",
"@celo/governance": "^5.0.9",
"@celo/network-utils": "^5.0.5",
"@celo/utils": "^5.0.6",
"@ethereumjs/util": "8.0.5",
Expand Down
15 changes: 4 additions & 11 deletions packages/celotool/src/cmds/unfreeze_contracts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ import yargs from 'yargs'

export const command = 'unfreeze-contracts'

export const describe = 'command for unfreezing epoch rewards and the exchange'
export const describe = 'command for unfreezing epoch rewards'

interface UnfreezeContractsArgv extends CeloEnvArgv {
exchange: boolean
rewards: boolean
freeze: boolean
precheck: boolean
Expand All @@ -20,11 +19,6 @@ interface UnfreezeContractsArgv extends CeloEnvArgv {

export const builder = (argv: yargs.Argv) => {
return addCeloEnvMiddleware(argv)
.option('exchange', {
type: 'boolean',
description: 'Affect the exchange',
default: true,
})
.option('rewards', {
type: 'boolean',
description: 'Affect epoch rewards',
Expand Down Expand Up @@ -57,13 +51,12 @@ export const handler = async (argv: UnfreezeContractsArgv) => {
console.info(`Using account: ${account}`)
kit.connection.defaultAccount = account

const [exchange, epochRewards] = await Promise.all([
argv.exchange ? kit._web3Contracts.getExchange() : null,
const [epochRewards, freezerContract] = await Promise.all([
argv.rewards ? kit._web3Contracts.getEpochRewards() : null,
kit._web3Contracts.getFreezer(),
])
const freezerContract = await kit._web3Contracts.getFreezer()

for (const [name, contract] of Object.entries({ exchange, epochRewards })) {
for (const [name, contract] of Object.entries({ epochRewards })) {
if (contract === null) {
continue
}
Expand Down
6 changes: 3 additions & 3 deletions packages/env-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"main": "index.js",
"license": "MIT",
"dependencies": {
"@celo/contractkit": "^6.0.0",
"@celo/contractkit": "^7.0.0",
"@celo/utils": "^5.0.6",
"@celo/base": "^6.0.0",
"@celo/connect": "^5.1.1",
"@celo/cryptographic-utils": "^5.0.6",
"@celo/connect": "^5.1.2",
"@celo/cryptographic-utils": "^5.0.7",
"bignumber.js": "^9.0.0",
"bunyan": "1.8.12",
"bunyan-gke-stackdriver": "0.1.2",
Expand Down
2 changes: 0 additions & 2 deletions packages/env-tests/src/monorepoRun.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import Web3 from 'web3'
import { loadFromEnvFile } from './env'
import { rootLogger } from './logger'
import { clearAllFundsToRoot, parseStableTokensList } from './scaffold'
import { runExchangeTest } from './tests/exchange'
import { runOracleTest } from './tests/oracle'
import { runReserveTest } from './tests/reserve'
import { runTransfersTest } from './tests/transfer'
Expand Down Expand Up @@ -36,7 +35,6 @@ function runTests() {

// TODO: Assert maximum loss after test
runTransfersTest(context, stableTokensToTest)
runExchangeTest(context, stableTokensToTest)
runOracleTest(context)
runReserveTest(context)
// TODO: Governance Proposals
Expand Down
86 changes: 0 additions & 86 deletions packages/env-tests/src/tests/exchange.ts

This file was deleted.

4 changes: 2 additions & 2 deletions packages/metadata-crawler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"homepage": "https://github.com/celo-org/celo-monorepo/tree/master/packages/metadata-crawler",
"repository": "https://github.com/celo-org/celo-monorepo/tree/master/packages/metadata-crawler",
"dependencies": {
"@celo/connect": "^5.1.1",
"@celo/contractkit": "^6.0.0",
"@celo/connect": "^5.1.2",
"@celo/contractkit": "^7.0.0",
"@celo/utils": "^5.0.6",
"@types/pg": "^7.14.3",
"bunyan": "1.8.12",
Expand Down
6 changes: 3 additions & 3 deletions packages/protocol/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@
"@0x/subproviders": "^7.0.1",
"@celo/base": "^6.0.0",
"@celo/bls12377js": "0.1.1",
"@celo/connect": "^5.1.1",
"@celo/cryptographic-utils": "^5.0.6",
"@celo/connect": "^5.1.2",
"@celo/cryptographic-utils": "^5.0.7",
"@celo/utils": "^5.0.6",
"@celo/wallet-local": "^5.1.1",
"@celo/wallet-local": "^5.1.2",
"@ethereumjs/util": "8.0.5",
"@ethereumjs/vm": "npm:@celo/[email protected]",
"@ganache/console.log": "0.3.0",
Expand Down
Loading

0 comments on commit 7c60ebf

Please sign in to comment.