Skip to content

Remove Mento dependencies, repoint stable tokens to IERC20CeloTokens #777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
martinvol wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Remove Mento dependencies, repoint stable tokens to IERC20CeloTokens #777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
"typescript": "5.3.3"
},
"resolutions": {
"@celo/abis": "file:/Users/martinvol/celo/celo-monorepo/packages/protocol/abis/celo-abis-13.0.0-post-audit.0.tgz",
Copy link
Copy Markdown
Contributor Author

@martinvol martinvol May 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will not work in the CI, this has to be reverted once the new version ABI's are published after celo-org/celo-monorepo#11745 gets merged

"web3": "1.10.4",
"web3-utils": "1.10.4",
"blind-threshold-bls": "npm:@celo/blind-threshold-bls@1.0.0-beta",
Expand Down
3 changes: 2 additions & 1 deletion packages/cli/src/commands/releasecelo/authorize.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,15 @@ export default class Authorize extends ReleaseGoldBaseCommand {
if (flags.role === 'validator' && !flags.force) {
checker.isNotValidator(this.releaseGoldWrapper.address)
}
await checker.runChecks()
// await checker.runChecks()

const accounts = await kit.contracts.getAccounts()
const sig = accounts.parseSignatureOfAddress(
this.releaseGoldWrapper.address,
flags.signer,
flags.signature
)
console.log(sig)

const isRevoked = await this.releaseGoldWrapper.isRevoked()
kit.defaultAccount = isRevoked
Expand Down
1 change: 0 additions & 1 deletion packages/sdk/contractkit/src/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export enum CeloContract {
MultiSig = 'MultiSig',
OdisPayments = 'OdisPayments',
Registry = 'Registry',
Reserve = 'Reserve',
ScoreManager = 'ScoreManager',
SortedOracles = 'SortedOracles',
StableToken = 'StableToken',
Expand Down
6 changes: 0 additions & 6 deletions packages/sdk/contractkit/src/contract-cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import { GovernanceWrapper } from './wrappers/Governance'
import { LockedGoldWrapper } from './wrappers/LockedGold'
import { MultiSigWrapper } from './wrappers/MultiSig'
import { OdisPaymentsWrapper } from './wrappers/OdisPayments'
import { ReserveWrapper } from './wrappers/Reserve'
import { ScoreManagerWrapper } from './wrappers/ScoreManager'
import { SortedOraclesWrapper } from './wrappers/SortedOracles'
import { StableTokenWrapper } from './wrappers/StableTokenWrapper'
Expand All @@ -38,7 +37,6 @@ const WrapperFactories = {
[CeloContract.CeloToken]: GoldTokenWrapper,
[CeloContract.MultiSig]: MultiSigWrapper,
[CeloContract.OdisPayments]: OdisPaymentsWrapper,
[CeloContract.Reserve]: ReserveWrapper,
[CeloContract.ScoreManager]: ScoreManagerWrapper,
[CeloContract.StableToken]: StableTokenWrapper,
[CeloContract.StableTokenEUR]: StableTokenWrapper,
Expand Down Expand Up @@ -87,7 +85,6 @@ interface WrapperCacheMap {
[CeloContract.LockedGold]?: LockedGoldWrapper
[CeloContract.MultiSig]?: MultiSigWrapper
[CeloContract.OdisPayments]?: OdisPaymentsWrapper
[CeloContract.Reserve]?: ReserveWrapper
[CeloContract.ScoreManager]?: ScoreManagerWrapper
[CeloContract.SortedOracles]?: SortedOraclesWrapper
[CeloContract.StableToken]?: StableTokenWrapper
Expand Down Expand Up @@ -169,9 +166,6 @@ export class WrapperCache implements ContractCacheType {
getOdisPayments() {
return this.getContract(CeloContract.OdisPayments)
}
getReserve() {
return this.getContract(CeloContract.Reserve)
}
getScoreManager() {
return this.getContract(CeloContract.ScoreManager)
}
Expand Down
3 changes: 0 additions & 3 deletions packages/sdk/contractkit/src/kit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import { AttestationsConfig } from './wrappers/Attestations'
import { ElectionConfig } from './wrappers/Election'
import { GovernanceConfig } from './wrappers/Governance'
import { LockedGoldConfig } from './wrappers/LockedGold'
import { ReserveConfig } from './wrappers/Reserve'
import { SortedOraclesConfig } from './wrappers/SortedOracles'
import { StableTokenConfig } from './wrappers/StableTokenWrapper'
import { ValidatorsConfig } from './wrappers/Validators'
Expand Down Expand Up @@ -65,7 +64,6 @@ export interface NetworkConfig {
governance: GovernanceConfig
lockedGold: LockedGoldConfig
sortedOracles: SortedOraclesConfig
reserve: ReserveConfig
validators: ValidatorsConfig
}

Expand Down Expand Up @@ -135,7 +133,6 @@ export class ContractKit {
CeloContract.Governance,
CeloContract.LockedCelo,
CeloContract.SortedOracles,
CeloContract.Reserve,
CeloContract.Validators,
CeloContract.FeeCurrencyDirectory,
CeloContract.EpochManager,
Expand Down
8 changes: 5 additions & 3 deletions packages/sdk/contractkit/src/mini-contract-cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { newAccounts } from '@celo/abis/web3/Accounts'
import { newGoldToken } from '@celo/abis/web3/GoldToken'
import { newStableToken } from '@celo/abis/web3/mento/StableToken'
import { newStableTokenBRL } from '@celo/abis/web3/mento/StableTokenBRL'
import { newStableTokenEUR } from '@celo/abis/web3/mento/StableTokenEUR'
import { newIERC20CeloTokens } from '@celo/abis/web3/IERC20CeloTokens'
import { StableToken } from '@celo/base'
import { Connection } from '@celo/connect'
import { AddressRegistry } from './address-registry'
Expand All @@ -13,6 +11,10 @@ import { AccountsWrapper } from './wrappers/Accounts'
import { GoldTokenWrapper } from './wrappers/GoldTokenWrapper'
import { StableTokenWrapper } from './wrappers/StableTokenWrapper'

const newStableToken = newIERC20CeloTokens
const newStableTokenBRL = newIERC20CeloTokens
const newStableTokenEUR = newIERC20CeloTokens

const MINIMUM_CONTRACTS = {
[CeloContract.Accounts]: {
newInstance: newAccounts,
Expand Down
4 changes: 1 addition & 3 deletions packages/sdk/contractkit/src/proxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ import { ABI as ScoreManagerABI } from '@celo/abis/web3/ScoreManager'
import { ABI as SortedOraclesABI } from '@celo/abis/web3/SortedOracles'
import { ABI as UniswapFeeHandlerSellerABI } from '@celo/abis/web3/UniswapFeeHandlerSeller'
import { ABI as ValidatorsABI } from '@celo/abis/web3/Validators'
import { ABI as ReserveABI } from '@celo/abis/web3/mento/Reserve'
import { ABI as StableTokenABI } from '@celo/abis/web3/mento/StableToken'
import { ABI as StableTokenABI } from '@celo/abis/web3/IERC20CeloTokens'
import { ABIDefinition, AbiItem } from '@celo/connect'
import Web3 from 'web3'

Expand Down Expand Up @@ -137,7 +136,6 @@ const initializeAbiMap = {
OdisPaymentsProxy: findInitializeAbi(OdisPaymentsABI),
ProxyProxy: findInitializeAbi(ProxyABI),
RegistryProxy: findInitializeAbi(RegistryABI),
ReserveProxy: findInitializeAbi(ReserveABI),
ScoreManagerProxy: findInitializeAbi(ScoreManagerABI),
SortedOraclesProxy: findInitializeAbi(SortedOraclesABI),
StableTokenProxy: findInitializeAbi(StableTokenABI),
Expand Down
7 changes: 1 addition & 6 deletions packages/sdk/contractkit/src/web3-contract-cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ import { newGovernance } from '@celo/abis/web3/Governance'
import { newGovernanceSlasher } from '@celo/abis/web3/GovernanceSlasher'
import { newIERC20 } from '@celo/abis/web3/IERC20'
import { newLockedGold } from '@celo/abis/web3/LockedGold'
import { newReserve } from '@celo/abis/web3/mento/Reserve'
import { newStableToken } from '@celo/abis/web3/mento/StableToken'
import { newIERC20CeloTokens as newStableToken } from '@celo/abis/web3/IERC20CeloTokens'
import { newMentoFeeHandlerSeller } from '@celo/abis/web3/MentoFeeHandlerSeller'
import { newMultiSig } from '@celo/abis/web3/MultiSig'
import { newOdisPayments } from '@celo/abis/web3/OdisPayments'
Expand Down Expand Up @@ -58,7 +57,6 @@ export const ContractFactories = {
[CeloContract.MultiSig]: newMultiSig,
[CeloContract.OdisPayments]: newOdisPayments,
[CeloContract.Registry]: newRegistry,
[CeloContract.Reserve]: newReserve,
[CeloContract.ScoreManager]: newScoreManager,
[CeloContract.SortedOracles]: newSortedOracles,
[CeloContract.StableToken]: newStableToken,
Expand Down Expand Up @@ -150,9 +148,6 @@ export class Web3ContractCache {
getRegistry() {
return this.getContract(CeloContract.Registry)
}
getReserve() {
return this.getContract(CeloContract.Reserve)
}
getScoreManager() {
return this.getContract(CeloContract.ScoreManager)
}
Expand Down
149 changes: 0 additions & 149 deletions packages/sdk/contractkit/src/wrappers/Reserve.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/sdk/contractkit/src/wrappers/StableTokenWrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ICeloToken } from '@celo/abis/web3/ICeloToken'
import { StableToken } from '@celo/abis/web3/mento/StableToken'
import { IERC20CeloTokens as StableToken } from '@celo/abis/web3/IERC20CeloTokens'
import { proxyCall, proxySend, stringIdentity, tupleParser, valueToString } from './BaseWrapper'
import { CeloTokenWrapper } from './CeloTokenWrapper'

Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1676,10 +1676,10 @@ __metadata:
languageName: node
linkType: hard

"@celo/abis@npm:13.0.0-post-audit.0":
"@celo/abis@file:/Users/martinvol/celo/celo-monorepo/packages/protocol/abis/celo-abis-13.0.0-post-audit.0.tgz::locator=celo%40workspace%3A.":
version: 13.0.0-post-audit.0
resolution: "@celo/abis@npm:13.0.0-post-audit.0"
checksum: da5aad746ff8fb3515513c7e42be4624e041ff08f7b8dd61a408292c6dd9a28baade1d47873e37024bb81ab91d758142da304b5f55994092530393f773e29f92
resolution: "@celo/abis@file:/Users/martinvol/celo/celo-monorepo/packages/protocol/abis/celo-abis-13.0.0-post-audit.0.tgz#/Users/martinvol/celo/celo-monorepo/packages/protocol/abis/celo-abis-13.0.0-post-audit.0.tgz::hash=f570a2&locator=celo%40workspace%3A."
checksum: 6c5b10374757fe6b2c1035203a1f73d76eb74f7fe4706de9d3965c81fff7924f83f85e11124727693cfaaf985d83e8483b6297e993a20b5a1a8dba196c34c11b
languageName: node
linkType: hard

Expand Down
Loading