-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* [WIP] Token trade plugin added but not tested yet * Eliminate indexed 'proposal' field on TokenTrade proposal type * [WIP] TokenTrade Proposal tests * Names and types tweaks * Updated packages with new migration version * updated test env version * Token trade tests (haven't run yet) and type changes * Comparison fix on trade test * [WIP] Test missing redeem step * tests works * fix lint error * removing logs * improving tests * [WIP] Approve tokens method * trying to make approve work * Token approval fix * Build fixes * creating token trade on test * lint fixed * waiting for plugin to be index * trying to fix test * Plugin Address fix * test env updated * removing old changes * hardcoding erc20 token abi based on Oren's feedback * tests for approve tokens created * improving approval test * bump version Co-authored-by: Nestor Amesty <nestor09amesty@gmail.com>
- Loading branch information
Showing
12 changed files
with
523 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| export * from './plugin' | ||
| export * from './proposal' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,175 @@ | ||
| import BN from 'bn.js' | ||
| import { DocumentNode } from 'graphql' | ||
| import gql from 'graphql-tag' | ||
| import { | ||
| Address, | ||
| Arc, | ||
| getEventArgs, | ||
| IGenesisProtocolParams, | ||
| IPluginState, | ||
| IProposalBaseCreateOptions, | ||
| ITransaction, | ||
| ITransactionReceipt, | ||
| mapGenesisProtocolParams, | ||
| Plugin, | ||
| ProposalPlugin, | ||
| transactionErrorHandler, | ||
| transactionResultHandler | ||
| } from '../../index' | ||
| import { ITokenTradeProposalState, TokenTradeProposal } from './proposal' | ||
|
|
||
| export interface ITokenTradeState extends IPluginState { | ||
| pluginParams: { | ||
| votingMachine: Address | ||
| voteParams: IGenesisProtocolParams | ||
| } | ||
| } | ||
|
|
||
| export interface IProposalCreateOptionsTokenTrade extends IProposalBaseCreateOptions { | ||
| sendTokenAddress: Address, | ||
| sendTokenAmount: number, | ||
| receiveTokenAddress: Address, | ||
| receiveTokenAmount: number, | ||
| descriptionHash: string | ||
| } | ||
|
|
||
| export interface IInitParamsTT { | ||
| daoId: string | ||
| votingMachine: string | ||
| votingParams: number[] | ||
| voteOnBehalf: string | ||
| voteParamsHash: string | ||
| } | ||
|
|
||
| export class TokenTrade extends ProposalPlugin< | ||
| ITokenTradeState, | ||
| ITokenTradeProposalState, | ||
| IProposalCreateOptionsTokenTrade> { | ||
|
|
||
| public static get fragment() { | ||
| if (!this.fragmentField) { | ||
| this.fragmentField = { | ||
| name: 'TokenTradeParams', | ||
| fragment: gql` fragment TokenTradeParams on ControllerScheme { | ||
| tokenTradeParams { | ||
| id | ||
| votingMachine | ||
| voteParams { | ||
| id | ||
| queuedVoteRequiredPercentage | ||
| queuedVotePeriodLimit | ||
| boostedVotePeriodLimit | ||
| preBoostedVotePeriodLimit | ||
| thresholdConst | ||
| limitExponentValue | ||
| quietEndingPeriod | ||
| proposingRepReward | ||
| votersReputationLossRatio | ||
| minimumDaoBounty | ||
| daoBountyConst | ||
| activationTime | ||
| voteOnBehalf | ||
| } | ||
| } | ||
| }` | ||
| } | ||
| } | ||
|
|
||
| return this.fragmentField | ||
| } | ||
|
|
||
| public static initializeParamsMap(initParams: IInitParamsTT) { | ||
|
|
||
| Object.keys(initParams).forEach((key) => { | ||
| if (initParams[key] === undefined) { | ||
| throw new Error(`TokenTrade's initialize parameter '${key}' cannot be undefined`) | ||
| } | ||
| }) | ||
|
|
||
| return [ | ||
| initParams.daoId, | ||
| initParams.votingMachine, | ||
| initParams.votingParams, | ||
| initParams.voteOnBehalf, | ||
| initParams.voteParamsHash | ||
| ] | ||
| } | ||
|
|
||
| public static itemMap(context: Arc, item: any, queriedId?: string): ITokenTradeState | null { | ||
| if (!item) { | ||
| return null | ||
| } | ||
|
|
||
| if (!item.tokenTradeParams) { | ||
| throw new Error(`Plugin ${queriedId ? `with id '${queriedId}'` : ''}wrongly instantiated as TokenTrade Plugin`) | ||
| } | ||
|
|
||
| const baseState = Plugin.itemMapToBaseState(context, item) | ||
|
|
||
| const tokenTradeParams = { | ||
| voteParams: mapGenesisProtocolParams(item.tokenTradeParams.voteParams), | ||
| votingMachine: item.tokenTradeParams.votingMachine | ||
| } | ||
|
|
||
| return { | ||
| ...baseState, | ||
| pluginParams: tokenTradeParams | ||
| } | ||
| } | ||
|
|
||
| private static fragmentField: { name: string, fragment: DocumentNode } | undefined | ||
|
|
||
| public async createProposalTransaction(options: IProposalCreateOptionsTokenTrade): Promise<ITransaction> { | ||
|
|
||
| if (options.plugin === undefined) { | ||
| throw new Error(`Missing argument "plugin" for TokenTrade in Proposal.create()`) | ||
| } | ||
| if (!options.receiveTokenAddress) { | ||
| throw new Error(`Missing argument "receiveTokenAddress" for TokenTrade in Proposal.create()`) | ||
| } | ||
| if (!options.sendTokenAddress) { | ||
| throw new Error(`Missing argument "sendTokenAddress" for TokenTrade in Proposal.create()`) | ||
| } | ||
| if (options.receiveTokenAmount <= 0) { | ||
| throw new Error(`Argument "receiveTokenAmount" must be greater than 0 for TokenTrade in Proposal.create()`) | ||
| } | ||
| if (options.sendTokenAmount <= 0) { | ||
| throw new Error(`Argument "sendTokenAmount" must be greater than 0 for TokenTrade in Proposal.create()`) | ||
| } | ||
|
|
||
| if (!options.descriptionHash) { | ||
| options.descriptionHash = await this.context.saveIPFSData(options) | ||
| } | ||
|
|
||
| const { address: pluginAddress } = await this.fetchState() | ||
|
|
||
| await this.context.approveTokens(options.sendTokenAddress, pluginAddress, new BN(options.sendTokenAmount)).send() | ||
|
|
||
| return { | ||
| contract: this.context.getContract(pluginAddress), | ||
| method: 'proposeTokenTrade', | ||
| args: [ | ||
| options.sendTokenAddress, | ||
| options.sendTokenAmount, | ||
| options.receiveTokenAddress, | ||
| options.receiveTokenAmount, | ||
| options.descriptionHash | ||
| ] | ||
| } | ||
| } | ||
|
|
||
| public createProposalTransactionMap(): transactionResultHandler<any> { | ||
| return async (receipt: ITransactionReceipt) => { | ||
| const args = getEventArgs(receipt, 'TokenTradeProposed', 'TokenTrade.createProposal') | ||
| const proposalId = args[1] | ||
| return new TokenTradeProposal(this.context, proposalId) | ||
| } | ||
| } | ||
|
|
||
| public createProposalErrorHandler(options: IProposalCreateOptionsTokenTrade): transactionErrorHandler { | ||
| return async (err) => { | ||
| throw err | ||
| } | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.