Revert "Merge branch 'main' into proposal/register-fee-sharing"

This reverts commit b9803b3, reversing
changes made to e56e270.

apps/enterprise/package.json

@@ -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.4",
+    "@terra-money/feather.js": "^1.0.8",
     "@terra-money/log-finder-ruleset": "^3.0.2",
     "@terra-money/terra-station-mobile": "1.0.8",
     "@terra-money/wallet-kit": "1.0.11",

apps/enterprise/src/chain/CosmWasm.ts

@@ -66,4 +66,11 @@ export interface WasmMigrateMsg {
   }
 }
 
+export interface StargateMsg {
+  stargate: {
+    type_url: string,
+    value: string
+  }
+}
+
 export type CosmWasmMsg = BankSendMsg | DelegateMsg | UndelegateMsg | RedelegateMsg | WasmExecuteMsg | WasmInstantiateMsg | WasmMigrateMsg

apps/enterprise/src/dao/shared/proposal.ts

@@ -37,6 +37,7 @@ export const sharedProposalTypes = [
   'redelegate',
   'council',
   'minWeightForRewards',
+  'registerFeeShare',
 ] as const;
 
 export const daoProposalsRecord = {
@@ -68,6 +69,7 @@ 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 = [
@@ -82,6 +84,7 @@ export const proposalActionTypeName = [
   'members',
   'distribute',
   'min weight',
+  'fee share',
   'text',
   'other',
 ] as const;
@@ -100,6 +103,7 @@ 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 => {

apps/enterprise/src/pages/create-proposal/CreateProposalPageContent.tsx

@@ -33,6 +33,7 @@ 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;
@@ -103,6 +104,7 @@ export const CreateProposalPageContent = () => {
                     undelegate={() => <UndelegateProposalForm />}
                     redelegate={() => <RedelegateProposalForm />}
                     minWeightForRewards={() => <MinimumWeightForRewardsProposalPage />}
+                    registerFeeShare={() => <RegisterFeeShareProposalPage />}
                   />
                 </CurrentDaoProvider>
               </Container>

apps/enterprise/src/pages/create-proposal/SelectProposalType.tsx

@@ -57,6 +57,7 @@ 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

apps/enterprise/src/pages/create-proposal/register-fee-share/RegisterFeeShareProposalForm.tsx

@@ -0,0 +1,62 @@
+import { ProposalForm } from '../shared/ProposalForm';
+import * as z from 'zod';
+import { useForm } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { toRegisterFeeShareMsg } from './helpers/toRegisterFeeShareMsg';
+import { VStack } from 'lib/ui/Stack';
+import { TextInput } from 'lib/ui/inputs/TextInput';
+import { zodAddressValidator } from 'chain/utils/validators';
+import { useCurrentDao } from 'dao/components/CurrentDaoProvider';
+
+interface RegisterFeeShareProposalFormSchema {
+  contractAddress: string;
+  withdrawerAddress: string;
+}
+
+export const RegisterFeeShareProposalForm = () => {
+  const dao = useCurrentDao();
+
+
+
+  const formSchema: z.ZodType<RegisterFeeShareProposalFormSchema> = z.object({
+    contractAddress: zodAddressValidator,
+    withdrawerAddress: zodAddressValidator
+  });
+
+  const {
+    formState: { isValid },
+    getValues,
+    register,
+  } = useForm<RegisterFeeShareProposalFormSchema>({
+    mode: 'all',
+    resolver: zodResolver(formSchema),
+  });
+
+  return (
+    <ProposalForm
+      disabled={!isValid}
+      getProposalActions={() => {
+        const { contractAddress, withdrawerAddress } = getValues();
+        return [
+          {
+            execute_msgs: {
+              action_type: 'register-fee-share',
+              msgs: [
+                toRegisterFeeShareMsg({
+                  contractAddress,
+                  deployerAddress: dao.address,
+                  withdrawerAddress,
+                }),
+              ],
+            },
+          },
+        ];
+      }}
+    >
+      <VStack alignItems="start" gap={8}>
+        <TextInput {...register('contractAddress')} label="Contract address" placeholder="Enter a DAO-owned address" />
+        <TextInput {...register('withdrawerAddress')} label="Withdrawer address" placeholder="Enter an address to whitelist for fee withdrawal" />
+      </VStack>
+    </ProposalForm>
+  );
+};

apps/enterprise/src/pages/create-proposal/register-fee-share/RegisterFeeShareProposalPage.tsx

@@ -0,0 +1,7 @@
+import { RegisterFeeShareProposalForm } from './RegisterFeeShareProposalForm';
+
+export const RegisterFeeShareProposalPage = () => {
+  return (
+      <RegisterFeeShareProposalForm />
+  );
+};

apps/enterprise/src/pages/create-proposal/register-fee-share/helpers/toRegisterFeeShareMsg.tsx

@@ -0,0 +1,25 @@
+import { StargateMsg } from 'chain/CosmWasm';
+import { MsgRegisterFeeShare } from '@terra-money/feather.js';
+
+
+interface RegisterFeeShareParams {
+  contractAddress: string
+  deployerAddress: string,
+  withdrawerAddress: string;
+}
+
+export const toRegisterFeeShareMsg = ({ contractAddress, deployerAddress, withdrawerAddress }: RegisterFeeShareParams) => {
+
+  const registerMsg = new MsgRegisterFeeShare(contractAddress, deployerAddress, withdrawerAddress);
+  const packed = registerMsg.packAny();
+
+
+  const msg: StargateMsg = {
+    stargate: {
+      type_url: packed.typeUrl,
+      value: Buffer.from(packed.value).toString("base64")
+    }
+  };
+
+  return JSON.stringify(msg);
+};

apps/enterprise/src/pages/proposal/ProposalActions.tsx

@@ -51,6 +51,7 @@ export const ProposalActions = () => {
                     <UpdateMultisigMembersAction />
                   </CurrentDAOMultisigMembersProvider>
                 )}
+                register_fee_share={() => null}
               />
             </CurrentProposalActionProvider>
           );

apps/enterprise/src/types/contracts/enterprise.ts

@@ -157,7 +157,8 @@ export module enterprise {
     | 'execute_msgs'
     | 'modify_multisig_membership'
     | 'distribute_funds'
-    | 'update_minimum_weight_for_rewards';
+    | 'update_minimum_weight_for_rewards'
+    | 'register_fee_share';
   export type Binary = string;
   export interface CreateProposalMsg {
     /**