From f5e6b7cdebc5729e68cb53e69c94ff1f4d2641a4 Mon Sep 17 00:00:00 2001 From: Santiago Gonzalez Date: Thu, 18 Jan 2024 15:33:50 -0500 Subject: [PATCH 1/5] fix decoding ABI params with struct type --- libs/tx-builder/src/utils/deepDecoding.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/tx-builder/src/utils/deepDecoding.ts b/libs/tx-builder/src/utils/deepDecoding.ts index 1c4f4b35..d1583f1d 100644 --- a/libs/tx-builder/src/utils/deepDecoding.ts +++ b/libs/tx-builder/src/utils/deepDecoding.ts @@ -157,13 +157,17 @@ const decodeMethod = (options: { const inputsWithValues = (inputs as any[]).map((input, index) => ({ name: input.name, type: input.type, - value: Array.isArray(result.args?.[index]) - ? // eslint-disable-next-line @typescript-eslint/no-explicit-any - (result.args?.[index] as Array).length + // eslint-disable-next-line @typescript-eslint/no-explicit-any + value: + (result.args?.[index] as any).constructor === {}.constructor + ? JSON.stringify(result.args?.[index]) // struct as json object + : Array.isArray(result.args?.[index]) // array ? // eslint-disable-next-line @typescript-eslint/no-explicit-any - (result.args?.[index] as Array).toString() - : '[]' - : result.args?.[index]?.toString() || '0x', + (result.args?.[index] as Array).length + ? // eslint-disable-next-line @typescript-eslint/no-explicit-any + (result.args?.[index] as Array).toString() + : '[]' + : result.args?.[index]?.toString() || '0x', })); return { From 94c1f7d468ab16a15b0154b5d41fb4f8d349e784 Mon Sep 17 00:00:00 2001 From: Santiago Gonzalez Date: Wed, 24 Jan 2024 16:30:23 -0500 Subject: [PATCH 2/5] increase PROCESS_PROPOSAL_GAS_LIMIT_ADDITION --- libs/utils/src/constants/proposals.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/utils/src/constants/proposals.ts b/libs/utils/src/constants/proposals.ts index 7dc896e7..7d1929cb 100644 --- a/libs/utils/src/constants/proposals.ts +++ b/libs/utils/src/constants/proposals.ts @@ -108,7 +108,7 @@ export const PROPOSAL_FILTERS: Record = { // Processing gas estimate buffer export const GAS_BUFFER_MULTIPLIER = 2; // Adding to the gas limit to account for cost of processProposal -export const PROCESS_PROPOSAL_GAS_LIMIT_ADDITION = 250000; +export const PROCESS_PROPOSAL_GAS_LIMIT_ADDITION = 400000; // Adding to the gas limit to account for cost of each action export const ACTION_GAS_LIMIT_ADDITION = 150000; From 149764b90351c070362272025269fe92fab80f93 Mon Sep 17 00:00:00 2001 From: skuhlmann Date: Fri, 26 Jan 2024 08:54:16 -0700 Subject: [PATCH 3/5] fixes base rpc --- .github/workflows/ci_develop.yaml | 1 - .github/workflows/ci_main.yaml | 1 - libs/keychain-utils/src/endpoints.ts | 4 +--- .../src/components/MemberList/MemberList.tsx | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/ci_develop.yaml b/.github/workflows/ci_develop.yaml index 6932df49..8cdd9530 100644 --- a/.github/workflows/ci_develop.yaml +++ b/.github/workflows/ci_develop.yaml @@ -39,7 +39,6 @@ jobs: echo NX_GRAPH_API_KEY_MAINNET=${{ secrets.NX_GRAPH_API_KEY_MAINNET }} >> .env echo NX_WALLET_CONNECT_ID=${{ secrets.NX_WALLET_CONNECT_ID }} >> .env echo NX_BASESCAN_KEY=${{ secrets.NX_BASESCAN_KEY }} >> .env - echo NX_BASE_ALCHEMY_KEY=${{ secrets.NX_BASE_ALCHEMY_KEY }} >> .env - name: Install dependencies run: yarn install diff --git a/.github/workflows/ci_main.yaml b/.github/workflows/ci_main.yaml index 0dd83ba1..c34d12a9 100644 --- a/.github/workflows/ci_main.yaml +++ b/.github/workflows/ci_main.yaml @@ -40,7 +40,6 @@ jobs: echo NX_GRAPH_API_KEY_MAINNET=${{ secrets.NX_GRAPH_API_KEY_MAINNET }} >> .env echo NX_WALLET_CONNECT_ID=${{ secrets.NX_WALLET_CONNECT_ID }} >> .env echo NX_BASESCAN_KEY=${{ secrets.NX_BASESCAN_KEY }} >> .env - echo NX_BASE_ALCHEMY_KEY=${{ secrets.NX_BASE_ALCHEMY_KEY }} >> .env - name: Install dependencies run: yarn install diff --git a/libs/keychain-utils/src/endpoints.ts b/libs/keychain-utils/src/endpoints.ts index da5365e4..7d639bb3 100644 --- a/libs/keychain-utils/src/endpoints.ts +++ b/libs/keychain-utils/src/endpoints.ts @@ -102,9 +102,7 @@ export const HAUS_RPC_DEFAULTS = { '0xaa36a7': process.env['NX_RIVET_KEY'] ? `https://${process.env['NX_RIVET_KEY']}.sepolia.rpc.rivet.cloud/` : 'https://eth-sepolia.g.alchemy.com/v2/demo', - '0x2105': process.env['NX_BASE_ALCHEMY_KEY'] - ? `https://base.g.alchemy.com/v2/${process.env['NX_BASE_ALCHEMY_KEY']}` - : `https://base.llamarpc.com`, + '0x2105': `https://base.llamarpc.com`, }; export const HAUS_RPC = { '0x1': process.env['NX_MAINNET_RPC'] diff --git a/libs/moloch-v3-macro-ui/src/components/MemberList/MemberList.tsx b/libs/moloch-v3-macro-ui/src/components/MemberList/MemberList.tsx index 0893d7c2..b43eb40c 100644 --- a/libs/moloch-v3-macro-ui/src/components/MemberList/MemberList.tsx +++ b/libs/moloch-v3-macro-ui/src/components/MemberList/MemberList.tsx @@ -54,7 +54,6 @@ export const MemberList = ({ hasNextPage, orderMembers, } = useDaoMembers(); - console.log('members', members, hasNextPage); const isMd = useBreakpoint(widthQuery.md); const tableData = useMemo(() => { From 0146f6d6ec88608ff6ad905af5ddbc978e66936c Mon Sep 17 00:00:00 2001 From: skuhlmann Date: Fri, 26 Jan 2024 09:28:08 -0700 Subject: [PATCH 4/5] version bump --- libs/abis/package.json | 4 ++-- libs/connect-context/package.json | 4 ++-- libs/connect/package.json | 4 ++-- libs/contract-utils/package.json | 4 ++-- libs/data-fetch-utils/package.json | 4 ++-- libs/form-builder-base/package.json | 4 ++-- libs/form-builder/package.json | 4 ++-- libs/keychain-utils/package.json | 4 ++-- libs/moloch-v3-data/package.json | 4 ++-- libs/moloch-v3-fields/package.json | 4 ++-- libs/moloch-v3-hooks/package.json | 4 ++-- libs/moloch-v3-legos/package.json | 4 ++-- libs/moloch-v3-macro-ui/package.json | 4 ++-- libs/profile-data/package.json | 4 ++-- libs/tx-builder/package.json | 4 ++-- libs/ui/package.json | 4 ++-- libs/utils/package.json | 4 ++-- libs/wizard-form-builder/package.json | 4 ++-- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/libs/abis/package.json b/libs/abis/package.json index 65c8a978..8704b2bc 100644 --- a/libs/abis/package.json +++ b/libs/abis/package.json @@ -1,5 +1,5 @@ { "name": "@daohaus/abis", - "version": "0.4.1", + "version": "0.4.2", "type": "commonjs" -} +} \ No newline at end of file diff --git a/libs/connect-context/package.json b/libs/connect-context/package.json index 906a55f4..a46461b4 100644 --- a/libs/connect-context/package.json +++ b/libs/connect-context/package.json @@ -1,4 +1,4 @@ { "name": "@daohaus/connect-context", - "version": "0.4.1" -} + "version": "0.4.2" +} \ No newline at end of file diff --git a/libs/connect/package.json b/libs/connect/package.json index 66fcf747..fb503a71 100644 --- a/libs/connect/package.json +++ b/libs/connect/package.json @@ -1,7 +1,7 @@ { "name": "@daohaus/connect", - "version": "0.4.1", + "version": "0.4.2", "peerDependencies": { "react-router-dom": "^6.4.3" } -} +} \ No newline at end of file diff --git a/libs/contract-utils/package.json b/libs/contract-utils/package.json index f15ab51a..276ca175 100644 --- a/libs/contract-utils/package.json +++ b/libs/contract-utils/package.json @@ -1,5 +1,5 @@ { "name": "@daohaus/contract-utils", - "version": "0.4.1", + "version": "0.4.2", "type": "commonjs" -} +} \ No newline at end of file diff --git a/libs/data-fetch-utils/package.json b/libs/data-fetch-utils/package.json index 2e1c39eb..525d6cdc 100644 --- a/libs/data-fetch-utils/package.json +++ b/libs/data-fetch-utils/package.json @@ -1,5 +1,5 @@ { "name": "@daohaus/data-fetch-utils", - "version": "0.4.1", + "version": "0.4.2", "type": "commonjs" -} +} \ No newline at end of file diff --git a/libs/form-builder-base/package.json b/libs/form-builder-base/package.json index a6ebf579..80ce2af4 100644 --- a/libs/form-builder-base/package.json +++ b/libs/form-builder-base/package.json @@ -1,4 +1,4 @@ { "name": "@daohaus/form-builder-base", - "version": "0.4.1" -} + "version": "0.4.2" +} \ No newline at end of file diff --git a/libs/form-builder/package.json b/libs/form-builder/package.json index 081d4f3a..a6c59974 100644 --- a/libs/form-builder/package.json +++ b/libs/form-builder/package.json @@ -1,4 +1,4 @@ { "name": "@daohaus/form-builder", - "version": "0.4.1" -} + "version": "0.4.2" +} \ No newline at end of file diff --git a/libs/keychain-utils/package.json b/libs/keychain-utils/package.json index 93efcd5c..845bef1e 100644 --- a/libs/keychain-utils/package.json +++ b/libs/keychain-utils/package.json @@ -1,4 +1,4 @@ { "name": "@daohaus/keychain-utils", - "version": "0.4.1" -} + "version": "0.4.2" +} \ No newline at end of file diff --git a/libs/moloch-v3-data/package.json b/libs/moloch-v3-data/package.json index ab5127d2..35ddeac1 100644 --- a/libs/moloch-v3-data/package.json +++ b/libs/moloch-v3-data/package.json @@ -1,5 +1,5 @@ { "name": "@daohaus/moloch-v3-data", - "version": "0.4.1", + "version": "0.4.2", "type": "commonjs" -} +} \ No newline at end of file diff --git a/libs/moloch-v3-fields/package.json b/libs/moloch-v3-fields/package.json index 6a8a7eaa..85e7ec55 100644 --- a/libs/moloch-v3-fields/package.json +++ b/libs/moloch-v3-fields/package.json @@ -1,4 +1,4 @@ { "name": "@daohaus/moloch-v3-fields", - "version": "0.4.1" -} + "version": "0.4.2" +} \ No newline at end of file diff --git a/libs/moloch-v3-hooks/package.json b/libs/moloch-v3-hooks/package.json index c0ca7953..bb0498e6 100644 --- a/libs/moloch-v3-hooks/package.json +++ b/libs/moloch-v3-hooks/package.json @@ -1,7 +1,7 @@ { "name": "@daohaus/moloch-v3-hooks", - "version": "0.4.1", + "version": "0.4.2", "peerDependencies": { "react-query": "^3.39.3" } -} +} \ No newline at end of file diff --git a/libs/moloch-v3-legos/package.json b/libs/moloch-v3-legos/package.json index 781b4523..ce516150 100644 --- a/libs/moloch-v3-legos/package.json +++ b/libs/moloch-v3-legos/package.json @@ -1,5 +1,5 @@ { "name": "@daohaus/moloch-v3-legos", - "version": "0.4.1", + "version": "0.4.2", "type": "commonjs" -} +} \ No newline at end of file diff --git a/libs/moloch-v3-macro-ui/package.json b/libs/moloch-v3-macro-ui/package.json index 8592ebe5..460c4117 100644 --- a/libs/moloch-v3-macro-ui/package.json +++ b/libs/moloch-v3-macro-ui/package.json @@ -1,7 +1,7 @@ { "name": "@daohaus/moloch-v3-macro-ui", - "version": "0.4.1", + "version": "0.4.2", "peerDependencies": { "react-router-dom": "^6.4.3" } -} +} \ No newline at end of file diff --git a/libs/profile-data/package.json b/libs/profile-data/package.json index 1ad225b3..4b6e8bdd 100644 --- a/libs/profile-data/package.json +++ b/libs/profile-data/package.json @@ -1,5 +1,5 @@ { "name": "@daohaus/profile-data", - "version": "0.4.1", + "version": "0.4.2", "type": "commonjs" -} +} \ No newline at end of file diff --git a/libs/tx-builder/package.json b/libs/tx-builder/package.json index 7432470e..249f6f5d 100644 --- a/libs/tx-builder/package.json +++ b/libs/tx-builder/package.json @@ -1,4 +1,4 @@ { "name": "@daohaus/tx-builder", - "version": "0.4.1" -} + "version": "0.4.2" +} \ No newline at end of file diff --git a/libs/ui/package.json b/libs/ui/package.json index 50b6ef9e..2ebf982a 100644 --- a/libs/ui/package.json +++ b/libs/ui/package.json @@ -1,4 +1,4 @@ { "name": "@daohaus/ui", - "version": "0.4.1" -} + "version": "0.4.2" +} \ No newline at end of file diff --git a/libs/utils/package.json b/libs/utils/package.json index c1f3dff4..dd1a6e05 100644 --- a/libs/utils/package.json +++ b/libs/utils/package.json @@ -1,4 +1,4 @@ { "name": "@daohaus/utils", - "version": "0.4.1" -} + "version": "0.4.2" +} \ No newline at end of file diff --git a/libs/wizard-form-builder/package.json b/libs/wizard-form-builder/package.json index 05f73df1..56a70814 100644 --- a/libs/wizard-form-builder/package.json +++ b/libs/wizard-form-builder/package.json @@ -1,4 +1,4 @@ { "name": "@daohaus/wizard-form-builder", - "version": "0.1.1" -} + "version": "0.1.2" +} \ No newline at end of file From bef9f99518d6107ed9db40a13ef366184504a7fc Mon Sep 17 00:00:00 2001 From: skuhlmann Date: Fri, 26 Jan 2024 09:28:23 -0700 Subject: [PATCH 5/5] version bump to 0.4.2 --- libs/abis/package.json | 2 +- libs/connect-context/package.json | 2 +- libs/connect/package.json | 2 +- libs/contract-utils/package.json | 2 +- libs/data-fetch-utils/package.json | 2 +- libs/form-builder-base/package.json | 2 +- libs/form-builder/package.json | 2 +- libs/keychain-utils/package.json | 2 +- libs/moloch-v3-data/package.json | 2 +- libs/moloch-v3-fields/package.json | 2 +- libs/moloch-v3-hooks/package.json | 2 +- libs/moloch-v3-legos/package.json | 2 +- libs/moloch-v3-macro-ui/package.json | 2 +- libs/profile-data/package.json | 2 +- libs/tx-builder/package.json | 2 +- libs/ui/package.json | 2 +- libs/utils/package.json | 2 +- libs/wizard-form-builder/package.json | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/libs/abis/package.json b/libs/abis/package.json index 8704b2bc..ef32e26e 100644 --- a/libs/abis/package.json +++ b/libs/abis/package.json @@ -2,4 +2,4 @@ "name": "@daohaus/abis", "version": "0.4.2", "type": "commonjs" -} \ No newline at end of file +} diff --git a/libs/connect-context/package.json b/libs/connect-context/package.json index a46461b4..a641c688 100644 --- a/libs/connect-context/package.json +++ b/libs/connect-context/package.json @@ -1,4 +1,4 @@ { "name": "@daohaus/connect-context", "version": "0.4.2" -} \ No newline at end of file +} diff --git a/libs/connect/package.json b/libs/connect/package.json index fb503a71..8b5adefc 100644 --- a/libs/connect/package.json +++ b/libs/connect/package.json @@ -4,4 +4,4 @@ "peerDependencies": { "react-router-dom": "^6.4.3" } -} \ No newline at end of file +} diff --git a/libs/contract-utils/package.json b/libs/contract-utils/package.json index 276ca175..4148f839 100644 --- a/libs/contract-utils/package.json +++ b/libs/contract-utils/package.json @@ -2,4 +2,4 @@ "name": "@daohaus/contract-utils", "version": "0.4.2", "type": "commonjs" -} \ No newline at end of file +} diff --git a/libs/data-fetch-utils/package.json b/libs/data-fetch-utils/package.json index 525d6cdc..d6801a4c 100644 --- a/libs/data-fetch-utils/package.json +++ b/libs/data-fetch-utils/package.json @@ -2,4 +2,4 @@ "name": "@daohaus/data-fetch-utils", "version": "0.4.2", "type": "commonjs" -} \ No newline at end of file +} diff --git a/libs/form-builder-base/package.json b/libs/form-builder-base/package.json index 80ce2af4..d3a5e33c 100644 --- a/libs/form-builder-base/package.json +++ b/libs/form-builder-base/package.json @@ -1,4 +1,4 @@ { "name": "@daohaus/form-builder-base", "version": "0.4.2" -} \ No newline at end of file +} diff --git a/libs/form-builder/package.json b/libs/form-builder/package.json index a6c59974..1d54ff50 100644 --- a/libs/form-builder/package.json +++ b/libs/form-builder/package.json @@ -1,4 +1,4 @@ { "name": "@daohaus/form-builder", "version": "0.4.2" -} \ No newline at end of file +} diff --git a/libs/keychain-utils/package.json b/libs/keychain-utils/package.json index 845bef1e..5f6232d4 100644 --- a/libs/keychain-utils/package.json +++ b/libs/keychain-utils/package.json @@ -1,4 +1,4 @@ { "name": "@daohaus/keychain-utils", "version": "0.4.2" -} \ No newline at end of file +} diff --git a/libs/moloch-v3-data/package.json b/libs/moloch-v3-data/package.json index 35ddeac1..ebcb6a2c 100644 --- a/libs/moloch-v3-data/package.json +++ b/libs/moloch-v3-data/package.json @@ -2,4 +2,4 @@ "name": "@daohaus/moloch-v3-data", "version": "0.4.2", "type": "commonjs" -} \ No newline at end of file +} diff --git a/libs/moloch-v3-fields/package.json b/libs/moloch-v3-fields/package.json index 85e7ec55..ae68e29c 100644 --- a/libs/moloch-v3-fields/package.json +++ b/libs/moloch-v3-fields/package.json @@ -1,4 +1,4 @@ { "name": "@daohaus/moloch-v3-fields", "version": "0.4.2" -} \ No newline at end of file +} diff --git a/libs/moloch-v3-hooks/package.json b/libs/moloch-v3-hooks/package.json index bb0498e6..f561a6cb 100644 --- a/libs/moloch-v3-hooks/package.json +++ b/libs/moloch-v3-hooks/package.json @@ -4,4 +4,4 @@ "peerDependencies": { "react-query": "^3.39.3" } -} \ No newline at end of file +} diff --git a/libs/moloch-v3-legos/package.json b/libs/moloch-v3-legos/package.json index ce516150..36bbbb48 100644 --- a/libs/moloch-v3-legos/package.json +++ b/libs/moloch-v3-legos/package.json @@ -2,4 +2,4 @@ "name": "@daohaus/moloch-v3-legos", "version": "0.4.2", "type": "commonjs" -} \ No newline at end of file +} diff --git a/libs/moloch-v3-macro-ui/package.json b/libs/moloch-v3-macro-ui/package.json index 460c4117..54feb974 100644 --- a/libs/moloch-v3-macro-ui/package.json +++ b/libs/moloch-v3-macro-ui/package.json @@ -4,4 +4,4 @@ "peerDependencies": { "react-router-dom": "^6.4.3" } -} \ No newline at end of file +} diff --git a/libs/profile-data/package.json b/libs/profile-data/package.json index 4b6e8bdd..936caad7 100644 --- a/libs/profile-data/package.json +++ b/libs/profile-data/package.json @@ -2,4 +2,4 @@ "name": "@daohaus/profile-data", "version": "0.4.2", "type": "commonjs" -} \ No newline at end of file +} diff --git a/libs/tx-builder/package.json b/libs/tx-builder/package.json index 249f6f5d..932e12d3 100644 --- a/libs/tx-builder/package.json +++ b/libs/tx-builder/package.json @@ -1,4 +1,4 @@ { "name": "@daohaus/tx-builder", "version": "0.4.2" -} \ No newline at end of file +} diff --git a/libs/ui/package.json b/libs/ui/package.json index 2ebf982a..caa84f3a 100644 --- a/libs/ui/package.json +++ b/libs/ui/package.json @@ -1,4 +1,4 @@ { "name": "@daohaus/ui", "version": "0.4.2" -} \ No newline at end of file +} diff --git a/libs/utils/package.json b/libs/utils/package.json index dd1a6e05..dabc3932 100644 --- a/libs/utils/package.json +++ b/libs/utils/package.json @@ -1,4 +1,4 @@ { "name": "@daohaus/utils", "version": "0.4.2" -} \ No newline at end of file +} diff --git a/libs/wizard-form-builder/package.json b/libs/wizard-form-builder/package.json index 56a70814..f5737d9d 100644 --- a/libs/wizard-form-builder/package.json +++ b/libs/wizard-form-builder/package.json @@ -1,4 +1,4 @@ { "name": "@daohaus/wizard-form-builder", "version": "0.1.2" -} \ No newline at end of file +}