Skip to content

Commit

Permalink
Revert "Register contract for fee sharing proposal"
Browse files Browse the repository at this point in the history
This reverts commit 4dd1a2f.
  • Loading branch information
vladjdk committed Nov 15, 2023
1 parent 4dd1a2f commit d98fdbc
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 682 deletions.
2 changes: 1 addition & 1 deletion apps/enterprise/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@hookform/resolvers": "^2.9.7",
"@sentry/integrations": "^7.52.1",
"@sentry/react": "^7.52.1",
"@terra-money/feather.js": "^1.0.8",
"@terra-money/feather.js": "^1.0.4",
"@terra-money/log-finder-ruleset": "^3.0.2",
"@terra-money/terra-station-mobile": "1.0.8",
"@terra-money/wallet-kit": "1.0.11",
Expand Down
7 changes: 0 additions & 7 deletions apps/enterprise/src/chain/CosmWasm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,4 @@ export interface WasmMigrateMsg {
}
}

export interface StargateMsg {
stargate: {
type_url: string,
value: string
}
}

export type CosmWasmMsg = BankSendMsg | DelegateMsg | UndelegateMsg | RedelegateMsg | WasmExecuteMsg | WasmInstantiateMsg | WasmMigrateMsg
4 changes: 0 additions & 4 deletions apps/enterprise/src/dao/shared/proposal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ export const sharedProposalTypes = [
'redelegate',
'council',
'minWeightForRewards',
'registerFeeShare',
] as const;

export const daoProposalsRecord = {
Expand Down Expand Up @@ -69,7 +68,6 @@ export const proposalTitle: Record<ProposalType, string> = {
redelegate: 'Redelegate LUNA',
council: 'Update council',
minWeightForRewards: 'Update minimum weight for rewards',
registerFeeShare: 'Register an address for fee sharing'
};

export const proposalActionTypeName = [
Expand All @@ -84,7 +82,6 @@ export const proposalActionTypeName = [
'members',
'distribute',
'min weight',
'fee share',
'text',
'other',
] as const;
Expand All @@ -103,7 +100,6 @@ export const proposalActionShortName: Record<enterprise.ProposalActionType, Prop
modify_multisig_membership: 'members',
distribute_funds: 'distribute',
update_minimum_weight_for_rewards: 'min weight',
register_fee_share: 'fee share'
};

export const getProposalActionType = (action: enterprise.ProposalAction): enterprise.ProposalActionType => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import { Center } from 'lib/ui/Center';
import { Spinner } from 'lib/ui/Spinner';
import { Text } from 'lib/ui/Text';
import { CreateProposalProvider } from './CreateProposalProvider';
import { RegisterFeeShareProposalPage } from './register-fee-share/RegisterFeeShareProposalPage';

type CreateProposalPageParams = {
type: ProposalType;
Expand Down Expand Up @@ -104,7 +103,6 @@ export const CreateProposalPageContent = () => {
undelegate={() => <UndelegateProposalForm />}
redelegate={() => <RedelegateProposalForm />}
minWeightForRewards={() => <MinimumWeightForRewardsProposalPage />}
registerFeeShare={() => <RegisterFeeShareProposalPage />}
/>
</CurrentDaoProvider>
</Container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ export const proposalDescription: Record<ProposalType, ReactNode> = {
mintNft:
'Mint a new DAO NFT to the specified addresses. This proposal will only work if the minter on the NFT contract is the DAO treasury address.',
minWeightForRewards: 'Update the minimum weight required to receive rewards.',
registerFeeShare: 'Register a contract address that was created by the DAO for fee sharing.'
};

// TODO: turn into a reusable component
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion apps/enterprise/src/pages/proposal/ProposalActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ export const ProposalActions = () => {
<UpdateMultisigMembersAction />
</CurrentDAOMultisigMembersProvider>
)}
register_fee_share={() => null}
/>
</CurrentProposalActionProvider>
);
Expand Down
3 changes: 1 addition & 2 deletions apps/enterprise/src/types/contracts/enterprise.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,7 @@ export module enterprise {
| 'execute_msgs'
| 'modify_multisig_membership'
| 'distribute_funds'
| 'update_minimum_weight_for_rewards'
| 'register_fee_share';
| 'update_minimum_weight_for_rewards';
export type Binary = string;
export interface CreateProposalMsg {
/**
Expand Down
Loading

0 comments on commit d98fdbc

Please sign in to comment.