Merge pull request #200 from cosmology-tech/eason/chain-template

bug fixed for chain-template
cosmology-tech · Aug 20, 2024 · ef1bcd1 · ef1bcd1
2 parents 0f4ba5d + c1b10e7
commit ef1bcd1
Show file tree

Hide file tree

Showing 17 changed files with 14,394 additions and 87 deletions.
diff --git a/.github/workflows/run-tests-build.yaml b/.github/workflows/run-tests-build.yaml
@@ -61,13 +61,18 @@ jobs:
       - name: Set up Yarn
         uses: threeal/setup-yarn-action@v2.0.0
 
+      - name: Get last git commit hash
+        run: |
+          echo "DIFF_HASH=$(git log -1 --pretty=format:%H)" >> $GITHUB_ENV
+
       - name: Cache NextJS
         uses: actions/cache@v4
         with:
           path: |
             ${{ github.workspace }}/.next/cache
           # Generate a new cache whenever packages or source files change.
-          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
+          #key: ${{ runner.os }}-nextjs-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
+          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/yarn.lock') }}-${{ env.DIFF_HASH }}
           # If source files changed but packages didn't, rebuild from a prior cache.
           restore-keys: |
             ${{ runner.os }}-nextjs-${{ hashFiles('**/yarn.lock') }}-

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
@@ -60,6 +60,8 @@ jobs:
         run: |
           cca --example nft --name nft
           cd nft
+          touch yarn.lock
+          yarn install
           yarn build
 
       - name: authz

diff --git a/examples/chain-template/components/asset-list/DropdownTransferModal.tsx b/examples/chain-template/components/asset-list/DropdownTransferModal.tsx
@@ -184,9 +184,9 @@ const OverviewTransferWrapper = (
         }
         return new BigNumber(asset.amount).gt(0);
       })
-      .filter((asset) => {
-        return asset.symbol !== transferToken.symbol;
-      })
+      // .filter((asset) => {
+      //   return asset.symbol !== transferToken.symbol;
+      // })
       .map((asset) => ({
         available: new BigNumber(asset.displayAmount).toNumber(),
         symbol: asset.symbol,
@@ -198,6 +198,7 @@ const OverviewTransferWrapper = (
         ).toNumber(),
       }));
   }, [assets, isDeposit, transferToken]);
+  console.log('assetOptions', assetOptions);
 
   const handleOnChange = (
     assetOption: Unpacked<OverviewTransferProps['dropdownList']>,
@@ -269,7 +270,7 @@ export const DropdownTransferModal = (props: OverviewTransferWrapperProps) => {
   return (
     <BasicModal
       isOpen={modalControl.isOpen}
-      title="Deposit"
+      title={transferInfoState.transferInfo.type}
       onClose={() => closeModal()}
     >
       {transferInfoState ? (

diff --git a/examples/chain-template/components/staking/DelegateModal.tsx b/examples/chain-template/components/staking/DelegateModal.tsx
@@ -20,8 +20,10 @@ import {
   isGreaterThanZero,
   shiftDigits,
   calcDollarValue,
+  getCoin,
+  getExponent,
+  toBaseAmount,
 } from '@/utils';
-import { getCoin, getExponent } from '@/utils';
 import { Prices, UseDisclosureReturn, useTx } from '@/hooks';
 
 const { delegate } = cosmos.staking.v1beta1.MessageComposer.fromPartial;
@@ -84,7 +86,7 @@ export const DelegateModal = ({
       delegatorAddress: address,
       validatorAddress: selectedValidator.address,
       amount: {
-        amount: shiftDigits(amount, exp),
+        amount: toBaseAmount(amount, exp), // shiftDigits(amount, exp),
         denom: coin.base,
       },
     });
@@ -220,8 +222,7 @@ export const DelegateModal = ({
               },
               {
                 label: 'Max',
-                onClick: handleMaxClick,
-                isLoading: isSimulating,
+                onClick: () => setAmount(Number(balance)),
               },
             ],
           }}

diff --git a/examples/chain-template/components/staking/RedelegateModal.tsx b/examples/chain-template/components/staking/RedelegateModal.tsx
@@ -17,6 +17,7 @@ import {
   getAssetLogoUrl,
   isGreaterThanZero,
   shiftDigits,
+  toBaseAmount,
   type ExtendedValidator as Validator,
 } from '@/utils';
 import { getCoin, getExponent } from '@/utils';
@@ -67,7 +68,7 @@ export const RedelegateModal = ({
       validatorDstAddress: validatorToRedelegate.address,
       amount: {
         denom: coin.base,
-        amount: shiftDigits(amount, exp),
+        amount: toBaseAmount(amount, exp),
       },
     });
 

diff --git a/examples/chain-template/components/staking/UndelegateModal.tsx b/examples/chain-template/components/staking/UndelegateModal.tsx
@@ -19,6 +19,7 @@ import {
   getAssetLogoUrl,
   isGreaterThanZero,
   shiftDigits,
+  toBaseAmount,
   type ExtendedValidator as Validator,
 } from '@/utils';
 
@@ -68,7 +69,7 @@ export const UndelegateModal = ({
       delegatorAddress: address,
       validatorAddress: selectedValidator.address,
       amount: {
-        amount: shiftDigits(amount, exp),
+        amount: toBaseAmount(amount, exp),
         denom: coin.base,
       },
     });

diff --git a/examples/chain-template/components/voting/Proposal.tsx b/examples/chain-template/components/voting/Proposal.tsx
@@ -56,7 +56,7 @@ export function Proposal({
   proposal,
   chainName,
   bondedTokens,
-  onVoteSuccess = () => {},
+  onVoteSuccess = () => { },
 }: ProposalProps) {
   const vote = votes?.[proposal.id.toString()];
 
@@ -92,9 +92,9 @@ export function Proposal({
 
   const total = proposal.finalTallyResult
     ? Object.values(proposal.finalTallyResult).reduce(
-        (sum, val) => sum + Number(val),
-        0
-      )
+      (sum, val) => sum + Number(val),
+      0
+    )
     : 0;
 
   const turnout = total / Number(bondedTokens);
@@ -248,9 +248,8 @@ export function Proposal({
                 px: '$2',
               }}
             >
-              {`Minimum of staked ${minStakedTokens} ${coin.symbol}(${
-                quorum * 100
-              }%) need to vote
+              {`Minimum of staked ${minStakedTokens} ${coin.symbol}(${quorum * 100
+                }%) need to vote
             for this proposal to pass.`}
             </Text>
           </Text>
@@ -347,14 +346,20 @@ export function Proposal({
         </Text>
 
         <Text fontSize="$sm" fontWeight="$normal" color="$textSecondary">
+          <div style={{ maxHeight: '128px', overflowY: 'scroll' }}>
+            <Markdown>{description}</Markdown>
+          </div>
+        </Text>
+
+        {/* <Text fontSize="$sm" fontWeight="$normal" color="$textSecondary">
           {showMore ? <Markdown>{description}</Markdown> : renderedDescription}
         </Text>
 
         <Box mt="$8" width="100%" display="flex" justifyContent="center">
           <Button intent="secondary" variant="ghost" onClick={toggleShowMore}>
             {showMore ? 'Show less' : 'Show more'}
           </Button>
-        </Box>
+        </Box> */}
       </Box>
     </Box>
   );

diff --git a/examples/chain-template/components/voting/Voting.tsx b/examples/chain-template/components/voting/Voting.tsx
@@ -60,7 +60,7 @@ export function Voting({ chainName }: VotingProps) {
     openModal();
     setProposal(proposal);
     // @ts-ignore
-    setTitle(`#${proposal.proposalId?.toString()} ${proposal.content?.title}`);
+    setTitle(`#${proposal.id?.toString()} ${proposal?.title}`);
   }
 
   const content = (
@@ -93,7 +93,7 @@ export function Voting({ chainName }: VotingProps) {
             id={`# ${proposal.id?.toString()}`}
             key={proposal.submitTime?.getTime()}
             // @ts-ignore
-            title={proposal.content?.title || ""}
+            title={proposal.content?.title || proposal.title || ''}
             status={status(proposal.status)}
             votes={votes(proposal.finalTallyResult!)}
             endTime={formatDate(proposal.votingEndTime)!}

diff --git a/examples/chain-template/config/chains.ts b/examples/chain-template/config/chains.ts
@@ -1,7 +1,7 @@
 import { chains } from 'chain-registry';
 import osmosis from 'chain-registry/mainnet/osmosis/chain';
 
-const chainNames = ['osmosistestnet', 'juno', 'stargaze'];
+const chainNames = ['osmosistestnet', 'juno', 'stargaze', 'osmosis'];
 
 export const chainOptions = chainNames.map(
   (chainName) => chains.find((chain) => chain.chain_name === chainName)!

diff --git a/examples/chain-template/hooks/asset-list/useAssets.ts b/examples/chain-template/hooks/asset-list/useAssets.ts
@@ -94,8 +94,13 @@ export const useAssets = (chainName: string) => {
         const isWithinLimit = ibcAssets.length <= MAX_TOKENS_TO_SHOW;
         return isWithinLimit || topTokens.includes(asset.symbol);
       })
-      .map((asset) => ({ denom: asset.base, amount: '0' }));
-
+      .map((asset) => ({ denom: asset.base, amount: '0' }))
+      .reduce((acc: { denom: string, amount: string }[], current) => {
+        if (!acc.some(balance => balance.denom === current.denom)) {
+          acc.push(current);
+        }
+        return acc;
+      }, []);
     const finalAssets = [...(nativeAndIbcBalances ?? []), ...emptyBalances]
       .map(({ amount, denom }) => {
         const asset = getAssetByDenom(denom);

diff --git a/examples/chain-template/utils/staking/math.ts b/examples/chain-template/utils/staking/math.ts
@@ -36,3 +36,13 @@ export const calcDollarValue = (
     .decimalPlaces(2)
     .toNumber();
 };
+
+export const toBaseAmount = (
+  num: string | number,
+  places: number
+) => {
+  return new BigNumber(num)
+    .shiftedBy(places)
+    .integerValue(BigNumber.ROUND_DOWN)
+    .toString();
+};
diff --git a/examples/nft/package.json b/examples/nft/package.json
@@ -12,20 +12,14 @@
     "locks": "npm run locks:remove && npm run locks:create",
     "watch:codegen": "npx graphql-code-generator --config ./config/codegen.ts --watch"
   },
-  "resolutions": {
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "@types/react": "18.0.25",
-    "@types/react-dom": "18.0.9"
-  },
   "dependencies": {
-    "@chain-registry/types": "0.17.0",
+    "@chain-registry/types": "^0.16.0",
     "@cosmjs/cosmwasm-stargate": "0.31.3",
     "@cosmjs/stargate": "0.32.3",
     "@cosmos-kit/react": "2.17.0",
     "@emotion/react": "11.10.6",
     "@emotion/styled": "11.10.6",
-    "@interchain-ui/react": "^1.23.29",
+    "@interchain-ui/react": "1.23.29",
     "@interchain-ui/react-no-ssr": "^0.1.6",
     "@tanstack/react-query": "4.32.0",
     "bignumber.js": "9.1.0",
@@ -49,8 +43,8 @@
     "@types/node": "^20.14.6",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "eslint": "8.56.0",
-    "eslint-config-next": "14.1.0",
+    "eslint": "8.57.0",
+    "eslint-config-next": "14.2.3",
     "generate-lockfile": "0.0.12",
     "typescript": "^5.1.6"
   },

diff --git a/examples/nft/utils/utils.ts b/examples/nft/utils/utils.ts
@@ -97,7 +97,7 @@ export function getLogo(from: Asset | Chain) {
 
 export function getChainLogo(name: string) {
   const chain = chains.find(chain => chain.chain_name === name)
-  return chain ? getLogo(chain) : null;
+  return chain ? getLogo(chain as any) : null;
 }
 
 export function getStargazeProfileLink(address: string | undefined) {