From 1ff4bd1b65e20b572e32c32f3f1aac58559406f3 Mon Sep 17 00:00:00 2001 From: skuhlmann Date: Tue, 28 Nov 2023 08:47:55 -0700 Subject: [PATCH 01/10] adds to networkData, validNetworks and explorer endpoints --- libs/keychain-utils/src/endpoints.ts | 3 +++ libs/keychain-utils/src/networkData.ts | 18 ++++++++++++++++++ libs/keychain-utils/src/validNetworks.ts | 2 ++ 3 files changed, 23 insertions(+) diff --git a/libs/keychain-utils/src/endpoints.ts b/libs/keychain-utils/src/endpoints.ts index c893a981..2fc3497f 100644 --- a/libs/keychain-utils/src/endpoints.ts +++ b/libs/keychain-utils/src/endpoints.ts @@ -21,6 +21,8 @@ export const ENDPOINTS: KeychainList = { '0x89': 'https://polygonscan.com', '0xa': 'https://optimistic.etherscan.io', '0xa4b1': 'https://arbiscan.io', + '0xaa36a7': 'https://sepolia.etherscan.io', + '0x2105': 'https://basescan.org/', }, GNOSIS_API: { '0x1': 'https://safe-transaction-mainnet.safe.global/api/v1', @@ -29,6 +31,7 @@ export const ENDPOINTS: KeychainList = { '0x89': 'https://safe-transaction-polygon.safe.global/api/v1', '0xa': 'https://safe-transaction-optimism.safe.global/api/v1', '0xa4b1': 'https://safe-transaction-arbitrum.safe.global/api/v1', + '0xaa36a7': 'https://safe-transaction-sepolia.safe.global/api/v1', }, GNOSIS_SAFE_UI: { '0x1': 'https://app.safe.global/eth', diff --git a/libs/keychain-utils/src/networkData.ts b/libs/keychain-utils/src/networkData.ts index 3f0f9889..5d0ba570 100644 --- a/libs/keychain-utils/src/networkData.ts +++ b/libs/keychain-utils/src/networkData.ts @@ -56,4 +56,22 @@ export const HAUS_NETWORK_DATA: Keychain = { explorer: ENDPOINTS.EXPLORER['0xa4b1'] as string, rpc: HAUS_RPC['0xa4b1'] as string, }, + '0xaa36a7': { + chainId: '0xaa36a7', + networkId: 11155111, + name: 'Sepolia', + symbol: 'ETH', + tokenDecimals: 18, + explorer: ENDPOINTS.EXPLORER['0xaa36a7'] as string, + rpc: HAUS_RPC['0x5'] as string, + }, + '0x2105': { + chainId: '0x2105', + networkId: 8453, + name: 'Base', + symbol: 'ETH', + tokenDecimals: 18, + explorer: ENDPOINTS.EXPLORER['0xaa36a7'] as string, + rpc: HAUS_RPC['0x5'] as string, + }, }; diff --git a/libs/keychain-utils/src/validNetworks.ts b/libs/keychain-utils/src/validNetworks.ts index 6d72f3b6..1d281068 100644 --- a/libs/keychain-utils/src/validNetworks.ts +++ b/libs/keychain-utils/src/validNetworks.ts @@ -5,4 +5,6 @@ export const VALID_NETWORKS = { '0xa': true, '0x89': true, '0xa4b1': true, + '0xaa36a7': true, + '0x2105': true, }; From fc39eb711c5623565c3649724b2a7c421acf1d44 Mon Sep 17 00:00:00 2001 From: skuhlmann Date: Tue, 28 Nov 2023 08:51:30 -0700 Subject: [PATCH 02/10] temp type fix --- libs/keychain-utils/src/endpoints.ts | 2 ++ libs/keychain-utils/src/networkData.ts | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/keychain-utils/src/endpoints.ts b/libs/keychain-utils/src/endpoints.ts index 2fc3497f..5a97028e 100644 --- a/libs/keychain-utils/src/endpoints.ts +++ b/libs/keychain-utils/src/endpoints.ts @@ -112,6 +112,8 @@ export const HAUS_RPC = { '0xa4b1': process.env['NX_ARBITRUM_RPC'] ? process.env['NX_ARBITRUM_RPC'] : HAUS_RPC_DEFAULTS['0xa4b1'], + '0xaa36a7': 'todo', + '0x2105': 'todo', }; export const GRAPH_API_KEYS = { '0x1': process.env['NX_GRAPH_API_KEY_MAINNET'], diff --git a/libs/keychain-utils/src/networkData.ts b/libs/keychain-utils/src/networkData.ts index 5d0ba570..07f10581 100644 --- a/libs/keychain-utils/src/networkData.ts +++ b/libs/keychain-utils/src/networkData.ts @@ -63,7 +63,7 @@ export const HAUS_NETWORK_DATA: Keychain = { symbol: 'ETH', tokenDecimals: 18, explorer: ENDPOINTS.EXPLORER['0xaa36a7'] as string, - rpc: HAUS_RPC['0x5'] as string, + rpc: 'todo', }, '0x2105': { chainId: '0x2105', @@ -72,6 +72,6 @@ export const HAUS_NETWORK_DATA: Keychain = { symbol: 'ETH', tokenDecimals: 18, explorer: ENDPOINTS.EXPLORER['0xaa36a7'] as string, - rpc: HAUS_RPC['0x5'] as string, + rpc: 'todo', }, }; From eb7b25d627d995bc2cbd8b369122bcad407cd88f Mon Sep 17 00:00:00 2001 From: Santiago Gonzalez Date: Sun, 3 Dec 2023 23:26:42 -0500 Subject: [PATCH 03/10] add sepolia + base contracts addresses --- libs/keychain-utils/src/contractKeychains.ts | 22 ++++++++++++++++++++ libs/keychain-utils/src/endpoints.ts | 5 ++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/libs/keychain-utils/src/contractKeychains.ts b/libs/keychain-utils/src/contractKeychains.ts index ba8411dc..8811045c 100644 --- a/libs/keychain-utils/src/contractKeychains.ts +++ b/libs/keychain-utils/src/contractKeychains.ts @@ -4,89 +4,111 @@ export const CONTRACT_KEYCHAINS: Record = { V3_FACTORY_ADV_TOKEN: { '0x1': '0x8a4A9E36106Ee290811B89e06e2faFE913507965', '0x5': '0xb0c5c96c3d21c1d58B98a5366dF0Af7AfcD94F95', + '0xaa36a7': '0xD69e5B8F6FA0E5d94B93848700655A78DF24e387', '0x64': '0x8a4A9E36106Ee290811B89e06e2faFE913507965', '0x89': '0x8a4A9E36106Ee290811B89e06e2faFE913507965', '0xa': '0x84561C97156a128662B62952890469214FDC87bf', '0xa4b1': '0x8a4A9E36106Ee290811B89e06e2faFE913507965', + '0x2105': '0x97Aaa5be8B38795245f1c38A883B44cccdfB3E11', }, V3_FACTORY_ORIGINAL: { '0x1': '0x7e988A9db2F8597735fc68D21060Daed948a3e8C', '0x5': '0x7e988A9db2F8597735fc68D21060Daed948a3e8C', + '0xaa36a7': '0xB2B3909661552942AE1115E9Fc99dF0BC93d71d0', '0x64': '0x7e988A9db2F8597735fc68D21060Daed948a3e8C', '0x89': '0x7e988A9db2F8597735fc68D21060Daed948a3e8C', '0xa': '0x3E0eAdE343Ddc556a6Cf0f858e4f685ba303ce71', '0xa4b1': '0xb08Cc8C343cF6dC20d8cf51Fb2D6C436c6390dAa', + '0x2105': '0x22e0382194AC1e9929E023bBC2fD2BA6b778E098', }, LOOT_SINGLETON: { '0x1': '0x0444AE984b9563C8480244693ED65F25B3C64a4E', '0x5': '0x0444AE984b9563C8480244693ED65F25B3C64a4E', + '0xaa36a7': '0x00768B047f73D88b6e9c14bcA97221d6E179d468', '0x64': '0x0444AE984b9563C8480244693ED65F25B3C64a4E', '0x89': '0x0444AE984b9563C8480244693ED65F25B3C64a4E', '0xa': '0x0444AE984b9563C8480244693ED65F25B3C64a4E', '0xa4b1': '0x0444AE984b9563C8480244693ED65F25B3C64a4E', + '0x2105': '0x52acf023d38A31f7e7bC92cCe5E68d36cC9752d6', }, SHARES_SINGLETON: { '0x1': '0x8124Cbb807A7b64123F3dEc3EF64995d8B10d3Eb', '0x5': '0x8124Cbb807A7b64123F3dEc3EF64995d8B10d3Eb', + '0xaa36a7': '0x52acf023d38A31f7e7bC92cCe5E68d36cC9752d6', '0x64': '0x8124Cbb807A7b64123F3dEc3EF64995d8B10d3Eb', '0x89': '0x8124Cbb807A7b64123F3dEc3EF64995d8B10d3Eb', '0xa': '0x8124Cbb807A7b64123F3dEc3EF64995d8B10d3Eb', '0xa4b1': '0x8124Cbb807A7b64123F3dEc3EF64995d8B10d3Eb', + '0x2105': '0xc650B598b095613cCddF0f49570FfA475175A5D5', }, BAAL_SINGLETON: { '0x1': '0x5DcE1044A7E2E35D6524001796cee47252f18411', '0x5': '0x5DcE1044A7E2E35D6524001796cee47252f18411', + '0xaa36a7': '0xc650B598b095613cCddF0f49570FfA475175A5D5', '0x64': '0x5DcE1044A7E2E35D6524001796cee47252f18411', '0x89': '0x5DcE1044A7E2E35D6524001796cee47252f18411', '0xa': '0x69f4D1788e39c87893C980c06EdF4b7f686e2938', '0xa4b1': '0x17234C0Ae25AF09fAf57B9D5ea2B93C1f220E800', + '0x2105': '0xE0F33E95aF46EAd1Fe181d2A74919bff903cD5d4', }, GNOSIS_MULTISEND: { '0x1': '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761', '0x5': '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761', + '0xaa36a7': '0x998739BFdAAdde7C933B942a68053933098f9EDa', '0x64': '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761', '0x89': '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761', '0xa': '0x998739BFdAAdde7C933B942a68053933098f9EDa', '0xa4b1': '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761', + '0x2105': '0x998739BFdAAdde7C933B942a68053933098f9EDa', }, GNOSIS_SIGNLIB: { '0x1': '0xA65387F16B013cf2Af4605Ad8aA5ec25a2cbA3a2', '0x5': '0xA65387F16B013cf2Af4605Ad8aA5ec25a2cbA3a2', + '0xaa36a7': '0x98FFBBF51bb33A056B08ddf711f289936AafF717', '0x64': '0xA65387F16B013cf2Af4605Ad8aA5ec25a2cbA3a2', '0x89': '0xA65387F16B013cf2Af4605Ad8aA5ec25a2cbA3a2', '0xa': '0x98FFBBF51bb33A056B08ddf711f289936AafF717', '0xa4b1': '0xA65387F16B013cf2Af4605Ad8aA5ec25a2cbA3a2', + '0x2105': '0x98FFBBF51bb33A056B08ddf711f289936AafF717', }, TRIBUTE_MINION: { '0x1': '0x5c17BFBaB751C5ddF1Ff267acF8fF919537F39Cf', '0x5': '0x5c17BFBaB751C5ddF1Ff267acF8fF919537F39Cf', + '0xaa36a7': '0xdb4D89F2199b9Cf451B7Ff4bdC94b1c96De4bdD0', '0x64': '0x5c17BFBaB751C5ddF1Ff267acF8fF919537F39Cf', '0x89': '0x51498dDdd2A8cdeC82932E08A37eBaF346C38EFd', '0xa': '0x7707964B4C24A6b8b7B747F7507F56818857A7C2', '0xa4b1': '0x7707964B4C24A6b8b7B747F7507F56818857A7C2', + '0x2105': '0x00768B047f73D88b6e9c14bcA97221d6E179d468', }, POSTER: { '0x1': '0x000000000000cd17345801aa8147b8d3950260ff', '0x5': '0x000000000000cd17345801aa8147b8d3950260ff', + '0xaa36a7': '0x000000000000cd17345801aa8147b8D3950260FF', '0x64': '0x000000000000cd17345801aa8147b8d3950260ff', '0x89': '0x000000000000cd17345801aa8147b8d3950260ff', '0xa': '0x000000000000cd17345801aa8147b8d3950260ff', '0xa4b1': '0x000000000000cd17345801aa8147b8d3950260ff', + '0x2105': '0x000000000000cd17345801aa8147b8D3950260FF', }, VAULT_SUMMONER: { '0x1': '0x594E630efbe8dbd810c168e3878817a4094bB312', '0x5': '0x594E630efbe8dbd810c168e3878817a4094bB312', + '0xaa36a7': '0x763f5c2E59f997A6cC48Bf1228aBf61325244702', '0x64': '0x594E630efbe8dbd810c168e3878817a4094bB312', '0x89': '0x594E630efbe8dbd810c168e3878817a4094bB312', '0xa': '0xb04111e7b4576164145EF97EB81fd43DA0F2D675', '0xa4b1': '0xC39E8D4DE75c6aC025a0C07dCd8Aeb0728C5DBF1', + '0x2105': '0x2eF2fC8a18A914818169eFa183db480d31a90c5D', }, ZODIAC_FACTORY: { '0x1': '0x00000000000DC7F163742Eb4aBEf650037b1f588', '0x5': '0x00000000000DC7F163742Eb4aBEf650037b1f588', + '0xaa36a7': '0x000000000000aDdB49795b0f9bA5BC298cDda236', '0x64': '0x00000000000DC7F163742Eb4aBEf650037b1f588', '0x89': '0x00000000000DC7F163742Eb4aBEf650037b1f588', '0xa': '0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC', '0xa4b1': '0x00000000000DC7F163742Eb4aBEf650037b1f588', + '0x2105': '0x000000000000aDdB49795b0f9bA5BC298cDda236', }, }; diff --git a/libs/keychain-utils/src/endpoints.ts b/libs/keychain-utils/src/endpoints.ts index 5a97028e..80144084 100644 --- a/libs/keychain-utils/src/endpoints.ts +++ b/libs/keychain-utils/src/endpoints.ts @@ -22,7 +22,7 @@ export const ENDPOINTS: KeychainList = { '0xa': 'https://optimistic.etherscan.io', '0xa4b1': 'https://arbiscan.io', '0xaa36a7': 'https://sepolia.etherscan.io', - '0x2105': 'https://basescan.org/', + '0x2105': 'https://basescan.org', }, GNOSIS_API: { '0x1': 'https://safe-transaction-mainnet.safe.global/api/v1', @@ -32,6 +32,7 @@ export const ENDPOINTS: KeychainList = { '0xa': 'https://safe-transaction-optimism.safe.global/api/v1', '0xa4b1': 'https://safe-transaction-arbitrum.safe.global/api/v1', '0xaa36a7': 'https://safe-transaction-sepolia.safe.global/api/v1', + '0x2105': 'https://safe-transaction-base.safe.global/api/v1', }, GNOSIS_SAFE_UI: { '0x1': 'https://app.safe.global/eth', @@ -40,6 +41,8 @@ export const ENDPOINTS: KeychainList = { '0x89': 'https://app.safe.global/matic', '0xa': 'https://app.safe.global/oeth', '0xa4b1': 'https://app.safe.global/arb', + '0xaa36a7': 'https://app.safe.global/sep', + '0x2105': 'https://app.safe.global/base', }, TABULA_GRAPH: { '0x5': From ca742e3c69c007510965947f787826cd6c0eee22 Mon Sep 17 00:00:00 2001 From: Santiago Gonzalez Date: Wed, 6 Dec 2023 16:08:04 -0500 Subject: [PATCH 04/10] add cookiejar contracts for Sepolia --- apps/summon-safe/src/utils/modules.ts | 35 +++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/apps/summon-safe/src/utils/modules.ts b/apps/summon-safe/src/utils/modules.ts index 78e76a9a..8193c98a 100644 --- a/apps/summon-safe/src/utils/modules.ts +++ b/apps/summon-safe/src/utils/modules.ts @@ -44,6 +44,13 @@ export const MODULES: Record = { }, '0x89': {}, '0xa4b1': {}, + '0xaa36a7': { + moduleFactory: { + address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45', + singletonAddress: '0x7c1Db931F804271E39b04E68221b71Ca94E9AFa5', + }, + }, + '0x2105': {}, }, params: [ { @@ -178,6 +185,13 @@ export const MODULES: Record = { }, '0x89': {}, '0xa4b1': {}, + '0xaa36a7': { + moduleFactory: { + address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45', + singletonAddress: '0x85C60D0674e161B7f9d1d40A2A46e4b788E7F057', + }, + }, + '0x2105': {}, }, params: [ { @@ -263,6 +277,13 @@ export const MODULES: Record = { }, '0x89': {}, '0xa4b1': {}, + '0xaa36a7': { + moduleFactory: { + address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45', + singletonAddress: '0x15f06a6dB8eC8D79Eaa49659210C1c58975a4056', + }, + }, + '0x2105': {}, }, params: [ { @@ -341,6 +362,13 @@ export const MODULES: Record = { }, '0x89': {}, '0xa4b1': {}, + '0xaa36a7': { + moduleFactory: { + address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45', + singletonAddress: '0x226E0601aa8b8CC34519c76Be00A7a6a8a4d97d2', + }, + }, + '0x2105': {}, }, params: [ { @@ -415,6 +443,13 @@ export const MODULES: Record = { }, '0x89': {}, '0xa4b1': {}, + '0xaa36a7': { + moduleFactory: { + address: '0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45', + singletonAddress: '0x0C7F0fC0ddb95d7099ED97c10A2DE549c03E39F9', + }, + }, + '0x2105': {}, }, params: [ { From 15c1a03aa59d7c565e8e69f57d0dcfa21dea10b7 Mon Sep 17 00:00:00 2001 From: skuhlmann Date: Mon, 18 Dec 2023 14:12:01 -0700 Subject: [PATCH 05/10] adds in all the network config, upgrades baal-contracts, deploys subgraphs --- apps/moloch-v3-subgraph/README.md | 4 + apps/moloch-v3-subgraph/manifests/config.js | 96 ++++++++ apps/moloch-v3-subgraph/subgraph.yaml | 72 +++--- libs/keychain-utils/src/contractKeychains.ts | 2 +- libs/keychain-utils/src/endpoints.ts | 15 +- libs/keychain-utils/src/networkData.ts | 6 +- libs/keychain-utils/src/validNetworks.ts | 2 +- libs/keychain-utils/src/viemUtils.ts | 4 + libs/tx-builder/src/utils/abi.ts | 2 + package.json | 2 +- yarn.lock | 226 +++---------------- 11 files changed, 195 insertions(+), 236 deletions(-) diff --git a/apps/moloch-v3-subgraph/README.md b/apps/moloch-v3-subgraph/README.md index 260f10db..3b9cd52a 100644 --- a/apps/moloch-v3-subgraph/README.md +++ b/apps/moloch-v3-subgraph/README.md @@ -12,6 +12,8 @@ The v3 subgraph currently supports goerli. It's deployed here: https://api.thegr `nx run moloch-v3-subgraph:generate-config --network=optimism` `nx run moloch-v3-subgraph:generate-config --network=arbitrum-one` `nx run moloch-v3-subgraph:generate-config --network=matic` +`nx run moloch-v3-subgraph:generate-config --network=sepolia` +`nx run moloch-v3-subgraph:generate-config --network=base` Supported Networks: @@ -34,6 +36,8 @@ To generate subgraph code, run the following command: `nx run moloch-v3-subgraph:graph-deploy --name=hausdao/daohaus-v3-optimism --network=optimism` `nx run moloch-v3-subgraph:graph-deploy --name=hausdao/daohaus-v3-arbitrum --network=arbitrum-one` `nx run moloch-v3-subgraph:graph-deploy --name=hausdao/daohaus-v3-polygon --network=matic` +`nx run moloch-v3-subgraph:graph-deploy --name=hausdao/daohaus-v3-sepolia --network=sepolia` +`nx run moloch-v3-subgraph:graph-deploy --name=hausdao/daohaus-v3-base --network=base` ### mainnet and gnosis chain deployment to studio diff --git a/apps/moloch-v3-subgraph/manifests/config.js b/apps/moloch-v3-subgraph/manifests/config.js index 54ad7e0a..4ab2f70f 100644 --- a/apps/moloch-v3-subgraph/manifests/config.js +++ b/apps/moloch-v3-subgraph/manifests/config.js @@ -317,4 +317,100 @@ module.exports.config = { }, ], }, + sepolia: { + dataSources: [ + { + name: 'baalSummoner-v1.0.0', + template: 'baal-summoner-ds.yaml', + address: '0xD69e5B8F6FA0E5d94B93848700655A78DF24e387', + startBlock: 4816767, + }, + { + name: 'baalSummoner-v2.0.0', + template: 'baal-summoner-2.0.0-ds.yaml', + address: '0xD69e5B8F6FA0E5d94B93848700655A78DF24e387', + startBlock: 4816767, + }, + { + name: 'vaultSummoner', + template: 'vault-summoner-ds.yaml', + address: '0x763f5c2E59f997A6cC48Bf1228aBf61325244702', + startBlock: 4816767, + }, + { + name: 'poster', + template: 'poster-ds.yaml', + address: '0x000000000000cd17345801aa8147b8d3950260ff', + startBlock: 4816767, + }, + { + name: 'tributeMinion-v1.0.0', + template: 'tribute-minion-ds.yaml', + address: '0xdb4D89F2199b9Cf451B7Ff4bdC94b1c96De4bdD0', + startBlock: 4816767, + }, + ], + templates: [ + { + name: 'baalTemplate', + template: 'baal-template.yaml', + }, + { + name: 'sharesTemplate', + template: 'shares-template.yaml', + }, + { + name: 'lootTemplate', + template: 'loot-template.yaml', + }, + ], + }, + base: { + dataSources: [ + { + name: 'baalSummoner-v1.0.0', + template: 'baal-summoner-ds.yaml', + address: '0x22e0382194AC1e9929E023bBC2fD2BA6b778E098', + startBlock: 7428979, + }, + { + name: 'baalSummoner-v2.0.0', + template: 'baal-summoner-2.0.0-ds.yaml', + address: '0x97Aaa5be8B38795245f1c38A883B44cccdfB3E11', + startBlock: 7428979, + }, + { + name: 'vaultSummoner', + template: 'vault-summoner-ds.yaml', + address: '0x2eF2fC8a18A914818169eFa183db480d31a90c5D', + startBlock: 7428979, + }, + { + name: 'poster', + template: 'poster-ds.yaml', + address: '0x000000000000cd17345801aa8147b8d3950260ff', + startBlock: 7428979, + }, + { + name: 'tributeMinion-v1.0.0', + template: 'tribute-minion-ds.yaml', + address: '0x00768B047f73D88b6e9c14bcA97221d6E179d468', + startBlock: 7428979, + }, + ], + templates: [ + { + name: 'baalTemplate', + template: 'baal-template.yaml', + }, + { + name: 'sharesTemplate', + template: 'shares-template.yaml', + }, + { + name: 'lootTemplate', + template: 'loot-template.yaml', + }, + ], + }, }; diff --git a/apps/moloch-v3-subgraph/subgraph.yaml b/apps/moloch-v3-subgraph/subgraph.yaml index 0cf5b3aa..949a623c 100644 --- a/apps/moloch-v3-subgraph/subgraph.yaml +++ b/apps/moloch-v3-subgraph/subgraph.yaml @@ -6,11 +6,11 @@ schema: dataSources: - kind: ethereum/contract name: BaalSummoner - network: gnosis + network: base source: - address: '0xf020a55794DB5e065692F86a0Eb82197850a09b9' + address: '0x22e0382194AC1e9929E023bBC2fD2BA6b778E098' abi: BaalSummoner - startBlock: 24659969 + startBlock: 7428979 mapping: kind: ethereum/events apiVersion: 0.0.6 @@ -30,11 +30,11 @@ dataSources: file: ./src/baal-summoner-mapping.ts - kind: ethereum/contract name: BaalSummonerV2 - network: gnosis + network: base source: - address: '0x7e988A9db2F8597735fc68D21060Daed948a3e8C' + address: '0x97Aaa5be8B38795245f1c38A883B44cccdfB3E11' abi: BaalSummonerV2 - startBlock: 25109196 + startBlock: 7428979 mapping: kind: ethereum/events apiVersion: 0.0.6 @@ -54,13 +54,35 @@ dataSources: - event: DaoReferral(bytes32,address) handler: handleDaoReferral file: ./src/baal-summoner-mapping.ts + - kind: ethereum/contract + name: VaultSummoner + network: base + source: + address: '0x2eF2fC8a18A914818169eFa183db480d31a90c5D' + abi: VaultSummoner + startBlock: 7428979 + mapping: + kind: ethereum/events + apiVersion: 0.0.6 + language: wasm/assemblyscript + entities: + - Dao + abis: + - name: VaultSummoner + file: ./abis/VaultSummoner.json + eventHandlers: + - event: SetVault((uint256,bool,address,address,string)) + handler: handleSetVault + - event: SetDelegate(address,address) + handler: handleSetVaultDelegate + file: ./src/vault-summoner-mapping.ts - kind: ethereum/contract name: Poster - network: gnosis + network: base source: address: '0x000000000000cd17345801aa8147b8d3950260ff' abi: Poster - startBlock: 24659969 + startBlock: 7428979 mapping: kind: ethereum/events apiVersion: 0.0.6 @@ -77,11 +99,11 @@ dataSources: file: ./src/poster-mapping.ts - kind: ethereum/contract name: TributeMinion - network: gnosis + network: base source: - address: '0x5c17BFBaB751C5ddF1Ff267acF8fF919537F39Cf' + address: '0x00768B047f73D88b6e9c14bcA97221d6E179d468' abi: TributeMinion - startBlock: 24659969 + startBlock: 7428979 mapping: kind: ethereum/events apiVersion: 0.0.6 @@ -99,32 +121,10 @@ dataSources: - event: TributeProposal(indexed address,address,uint256,address,uint256) handler: handleTributeProposal file: ./src/tribute-minion-mapping.ts - - kind: ethereum/contract - name: VaultSummoner - network: gnosis - source: - address: '0x594E630efbe8dbd810c168e3878817a4094bB312' - abi: VaultSummoner - startBlock: 25109199 - mapping: - kind: ethereum/events - apiVersion: 0.0.6 - language: wasm/assemblyscript - entities: - - Dao - abis: - - name: VaultSummoner - file: ./abis/VaultSummoner.json - eventHandlers: - - event: SetVault((uint256,bool,address,address,string)) - handler: handleSetVault - - event: SetDelegate(address,address) - handler: handleSetVaultDelegate - file: ./src/vault-summoner-mapping.ts templates: - kind: ethereum/contract name: BaalTemplate - network: gnosis + network: base source: abi: Baal mapping: @@ -173,7 +173,7 @@ templates: handler: handleLockManager - kind: ethereum/contract name: SharesTemplate - network: gnosis + network: base source: abi: Shares mapping: @@ -196,7 +196,7 @@ templates: handler: handleSharesTransfer - kind: ethereum/contract name: LootTemplate - network: gnosis + network: base source: abi: Loot mapping: diff --git a/libs/keychain-utils/src/contractKeychains.ts b/libs/keychain-utils/src/contractKeychains.ts index 8811045c..70d7397a 100644 --- a/libs/keychain-utils/src/contractKeychains.ts +++ b/libs/keychain-utils/src/contractKeychains.ts @@ -4,7 +4,7 @@ export const CONTRACT_KEYCHAINS: Record = { V3_FACTORY_ADV_TOKEN: { '0x1': '0x8a4A9E36106Ee290811B89e06e2faFE913507965', '0x5': '0xb0c5c96c3d21c1d58B98a5366dF0Af7AfcD94F95', - '0xaa36a7': '0xD69e5B8F6FA0E5d94B93848700655A78DF24e387', + '0xaa36a7': '0xB2B3909661552942AE1115E9Fc99dF0BC93d71d0', '0x64': '0x8a4A9E36106Ee290811B89e06e2faFE913507965', '0x89': '0x8a4A9E36106Ee290811B89e06e2faFE913507965', '0xa': '0x84561C97156a128662B62952890469214FDC87bf', diff --git a/libs/keychain-utils/src/endpoints.ts b/libs/keychain-utils/src/endpoints.ts index 80144084..3f5ec48f 100644 --- a/libs/keychain-utils/src/endpoints.ts +++ b/libs/keychain-utils/src/endpoints.ts @@ -13,6 +13,9 @@ export const ENDPOINTS: KeychainList = { 'https://api.thegraph.com/subgraphs/name/hausdao/daohaus-v3-optimism', '0xa4b1': 'https://api.thegraph.com/subgraphs/name/hausdao/daohaus-v3-arbitrum', + '0xaa36a7': + 'https://api.thegraph.com/subgraphs/name/hausdao/daohaus-v3-sepolia', + '0x2105': 'https://api.thegraph.com/subgraphs/name/hausdao/daohaus-v3-base', }, EXPLORER: { '0x1': 'https://etherscan.io', @@ -95,6 +98,10 @@ export const HAUS_RPC_DEFAULTS = { '0xa4b1': process.env['NX_ARBITRUM_ALCHEMY_KEY'] ? `https://arb-mainnet.g.alchemy.com/v2/${process.env['NX_ARBITRUM_ALCHEMY_KEY']}` : 'https://arb1.arbitrum.io/rpc', + '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': '**TODO', }; export const HAUS_RPC = { '0x1': process.env['NX_MAINNET_RPC'] @@ -115,8 +122,10 @@ export const HAUS_RPC = { '0xa4b1': process.env['NX_ARBITRUM_RPC'] ? process.env['NX_ARBITRUM_RPC'] : HAUS_RPC_DEFAULTS['0xa4b1'], - '0xaa36a7': 'todo', - '0x2105': 'todo', + '0xaa36a7': process.env['NX_SEPOLIA_RPC'] + ? process.env['NX_SEPOLIA_RPC'] + : HAUS_RPC_DEFAULTS['0xaa36a7'], + '0x2105': '**TODO', }; export const GRAPH_API_KEYS = { '0x1': process.env['NX_GRAPH_API_KEY_MAINNET'], @@ -138,4 +147,6 @@ export const ABI_EXPLORER_KEYS: Keychain = { '0x89': process.env['NX_POLYGONSCAN_KEY'], '0xa': process.env['NX_OPTIMISMSCAN_KEY'], '0xa4b1': process.env['NX_ARBISCAN_KEY'], + '0xaa36a7': process.env['NX_ETHERSCAN_KEY'], + '0x2105': '**TODO', }; diff --git a/libs/keychain-utils/src/networkData.ts b/libs/keychain-utils/src/networkData.ts index 07f10581..d3a5ab24 100644 --- a/libs/keychain-utils/src/networkData.ts +++ b/libs/keychain-utils/src/networkData.ts @@ -63,7 +63,7 @@ export const HAUS_NETWORK_DATA: Keychain = { symbol: 'ETH', tokenDecimals: 18, explorer: ENDPOINTS.EXPLORER['0xaa36a7'] as string, - rpc: 'todo', + rpc: HAUS_RPC['0xaa36a7'] as string, }, '0x2105': { chainId: '0x2105', @@ -71,7 +71,7 @@ export const HAUS_NETWORK_DATA: Keychain = { name: 'Base', symbol: 'ETH', tokenDecimals: 18, - explorer: ENDPOINTS.EXPLORER['0xaa36a7'] as string, - rpc: 'todo', + explorer: ENDPOINTS.EXPLORER['0x2105'] as string, + rpc: '**TODO', }, }; diff --git a/libs/keychain-utils/src/validNetworks.ts b/libs/keychain-utils/src/validNetworks.ts index 1d281068..451533ed 100644 --- a/libs/keychain-utils/src/validNetworks.ts +++ b/libs/keychain-utils/src/validNetworks.ts @@ -6,5 +6,5 @@ export const VALID_NETWORKS = { '0x89': true, '0xa4b1': true, '0xaa36a7': true, - '0x2105': true, + '0x2105': false, }; diff --git a/libs/keychain-utils/src/viemUtils.ts b/libs/keychain-utils/src/viemUtils.ts index 6920591b..4bb72cb8 100644 --- a/libs/keychain-utils/src/viemUtils.ts +++ b/libs/keychain-utils/src/viemUtils.ts @@ -5,6 +5,8 @@ import { gnosis, goerli, optimism, + base, + sepolia, Chain, } from 'wagmi/chains'; import { Keychain } from './types'; @@ -16,4 +18,6 @@ export const VIEM_CHAINS: Keychain = { '0x89': polygon, '0xa': optimism, '0xa4b1': arbitrum, + '0xaa36a7': sepolia, + '0x2105': base, }; diff --git a/libs/tx-builder/src/utils/abi.ts b/libs/tx-builder/src/utils/abi.ts index d6ab251b..ba77f15a 100644 --- a/libs/tx-builder/src/utils/abi.ts +++ b/libs/tx-builder/src/utils/abi.ts @@ -52,6 +52,8 @@ const getABIUrl = ({ '0x89': `https://api.polygonscan.com/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys[chainId]}`, '0xa': `https://api-optimistic.etherscan.io/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys[chainId]}`, '0xa4b1': `https://api.arbiscan.io/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apiKey=${explorerKeys[chainId]}`, + '0xaa36a7': `https://api-sepolia.etherscan.io/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys[chainId]}`, + '0x2105': '**TODO', }; return TEMPORARY_ABI_EXPLORER[chainId]?.replace(ABI_ADDRESS, contractAddress); diff --git a/package.json b/package.json index 4bf6c062..e30af540 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.cd77847.0" }, "dependencies": { - "@daohaus/baal-contracts": "^1.2.9", + "@daohaus/baal-contracts": "^1.2.14", "@gnosis.pm/safe-apps-react-sdk": "^4.6.2", "@gnosis.pm/safe-apps-web3modal": "^17.0.2", "@gnosis.pm/safe-react-components": "^1.2.0", diff --git a/yarn.lock b/yarn.lock index 6125fa04..dbe1ac0b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -55,39 +55,6 @@ dependencies: node-fetch "^2.6.1" -"@aws-crypto/sha256-js@1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-1.2.2.tgz#02acd1a1fda92896fc5a28ec7c6e164644ea32fc" - integrity sha512-Nr1QJIbW/afYYGzYvrF70LtaHrIRtd4TNAglX8BvlfxJLZ45SAmueIKYl5tWoNBPzp65ymXGFK0Bb1vZUpuc9g== - dependencies: - "@aws-crypto/util" "^1.2.2" - "@aws-sdk/types" "^3.1.0" - tslib "^1.11.1" - -"@aws-crypto/util@^1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-1.2.2.tgz#b28f7897730eb6538b21c18bd4de22d0ea09003c" - integrity sha512-H8PjG5WJ4wz0UXAFXeJjWCW1vkvIJ3qUUD+rGRwJ2/hj+xT58Qle2MTql/2MGzkU+1JLAFuR6aJpLAjHwhmwwg== - dependencies: - "@aws-sdk/types" "^3.1.0" - "@aws-sdk/util-utf8-browser" "^3.0.0" - tslib "^1.11.1" - -"@aws-sdk/types@^3.1.0": - version "3.387.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.387.0.tgz#15a968344956b2587dbab1224718d72329e050f4" - integrity sha512-YTjFabNwjTF+6yl88f0/tWff018qmmgMmjlw45s6sdVKueWxdxV68U7gepNLF2nhaQPZa6FDOBoA51NaviVs0Q== - dependencies: - "@smithy/types" "^2.1.0" - tslib "^2.5.0" - -"@aws-sdk/util-utf8-browser@^3.0.0": - version "3.259.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz#3275a6f5eb334f96ca76635b961d3c50259fd9ff" - integrity sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw== - dependencies: - tslib "^2.3.1" - "@babel/cli@^7.21.0": version "7.22.10" resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.22.10.tgz#25e4bbd8d0a0d8b4b389e1b5e2d7a238bd4c1b75" @@ -1459,15 +1426,15 @@ debug "^3.1.0" lodash.once "^4.1.1" -"@daohaus/baal-contracts@^1.2.9": - version "1.2.9" - resolved "https://registry.yarnpkg.com/@daohaus/baal-contracts/-/baal-contracts-1.2.9.tgz#7a5421b731a9105b533641b86f18df437c9873f7" - integrity sha512-4vpgJB5r9IjH5GYhm+X7/vXXD61uvCF8kmFp89Aexj7R312gjvpgMO62fjR7BLBG71u7YJE3jSWWL6woeIfPdg== +"@daohaus/baal-contracts@^1.2.14": + version "1.2.14" + resolved "https://registry.yarnpkg.com/@daohaus/baal-contracts/-/baal-contracts-1.2.14.tgz#9a2828ad6a514dde68289655fbbc928ddd4fb08c" + integrity sha512-v7DmtbjnOkqpEngp3Ta7M24S6nQqNYfJkuBfrBQEEzckhEjF+Z8dINZLEhP/FzFYbz2/fR2TE3Ku8q8qlf66pg== dependencies: "@gnosis.pm/zodiac" "^3.3.7" "@opengsn/contracts" "2.2.5" - "@openzeppelin/hardhat-upgrades" "^1.21.0" - hardhat-contract-sizer "^2.4.0" + "@openzeppelin/contracts" "^4.8.0" + "@openzeppelin/contracts-upgradeable" "^4.8.0" "@discoveryjs/json-ext@^0.5.3": version "0.5.7" @@ -1736,7 +1703,7 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.0.0", "@ethersproject/abi@^5.6.3", "@ethersproject/abi@^5.7.0": +"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.0.0", "@ethersproject/abi@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.7.0.tgz#b3f3e045bbbeed1af3947335c247ad625a44e449" integrity sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA== @@ -3782,6 +3749,11 @@ dependencies: "@openzeppelin/contracts" "^4.2.0" +"@openzeppelin/contracts-upgradeable@^4.8.0": + version "4.9.5" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.9.5.tgz#572b5da102fc9be1d73f34968e0ca56765969812" + integrity sha512-f7L1//4sLlflAN7fVzJLoRedrf5Na3Oal5PZfIq55NFcVZ90EpV1q5xOvL4lFvg3MNICSDr2hH0JUBxwlxcoPg== + "@openzeppelin/contracts-upgradeable@^4.8.1": version "4.9.3" resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.9.3.tgz#ff17a80fb945f5102571f8efecb5ce5915cc4811" @@ -3792,53 +3764,10 @@ resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.3.tgz#00d7a8cf35a475b160b3f0293a6403c511099364" integrity sha512-He3LieZ1pP2TNt5JbkPA4PNT9WC3gOTOlDcFGJW4Le4QKqwmiNJCRt44APfxMxvq7OugU/cqYuPcSBzOw38DAg== -"@openzeppelin/defender-base-client@^1.46.0": - version "1.48.0" - resolved "https://registry.yarnpkg.com/@openzeppelin/defender-base-client/-/defender-base-client-1.48.0.tgz#9103b1b036db0451b52d7899a277bf24db4c4b06" - integrity sha512-HFO87s010hRrMjyh2xYOCEAkLe21BfIbho7n5/kikA6A1ZgXi7MsEiqnQv1zP4bxMJgxGZ5b3t4tt6fWrakbag== - dependencies: - amazon-cognito-identity-js "^6.0.1" - async-retry "^1.3.3" - axios "^1.4.0" - lodash "^4.17.19" - node-fetch "^2.6.0" - -"@openzeppelin/hardhat-upgrades@^1.21.0": - version "1.28.0" - resolved "https://registry.yarnpkg.com/@openzeppelin/hardhat-upgrades/-/hardhat-upgrades-1.28.0.tgz#6361f313a8a879d8a08a5e395acf0933bc190950" - integrity sha512-7sb/Jf+X+uIufOBnmHR0FJVWuxEs2lpxjJnLNN6eCJCP8nD0v+Ot5lTOW2Qb/GFnh+fLvJtEkhkowz4ZQ57+zQ== - dependencies: - "@openzeppelin/defender-base-client" "^1.46.0" - "@openzeppelin/platform-deploy-client" "^0.8.0" - "@openzeppelin/upgrades-core" "^1.27.0" - chalk "^4.1.0" - debug "^4.1.1" - proper-lockfile "^4.1.1" - -"@openzeppelin/platform-deploy-client@^0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@openzeppelin/platform-deploy-client/-/platform-deploy-client-0.8.0.tgz#af6596275a19c283d6145f0128cc1247d18223c1" - integrity sha512-POx3AsnKwKSV/ZLOU/gheksj0Lq7Is1q2F3pKmcFjGZiibf+4kjGxr4eSMrT+2qgKYZQH1ZLQZ+SkbguD8fTvA== - dependencies: - "@ethersproject/abi" "^5.6.3" - "@openzeppelin/defender-base-client" "^1.46.0" - axios "^0.21.2" - lodash "^4.17.19" - node-fetch "^2.6.0" - -"@openzeppelin/upgrades-core@^1.27.0": - version "1.28.0" - resolved "https://registry.yarnpkg.com/@openzeppelin/upgrades-core/-/upgrades-core-1.28.0.tgz#19405f272dc09e766c756d9d149cbd680168aef7" - integrity sha512-8RKlyg98Adv+46GxDaR0awL3R8bVCcQ27DcSEwrgWOp6siHh8sZg4a2l+2dhPl1510S6uBfhHSydMH5VX2BV5g== - dependencies: - cbor "^9.0.0" - chalk "^4.1.0" - compare-versions "^6.0.0" - debug "^4.1.1" - ethereumjs-util "^7.0.3" - minimist "^1.2.7" - proper-lockfile "^4.1.1" - solidity-ast "^0.4.26" +"@openzeppelin/contracts@^4.8.0": + version "4.9.5" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.5.tgz#1eed23d4844c861a1835b5d33507c1017fa98de8" + integrity sha512-ZK+W5mVhRppff9BE6YdR8CC52C8zAvsVAiWhEtQ5+oNxFE6h1WdeWo+FJSF8KKvtxxVYZ7MTP/5KoVpAU3aSWg== "@parcel/watcher@2.0.4": version "2.0.4" @@ -4514,13 +4443,6 @@ dependencies: "@sinonjs/commons" "^1.7.0" -"@smithy/types@^2.1.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/types/-/types-2.2.0.tgz#52fa236967729f5a4e2c6c334f1a03930fa86f67" - integrity sha512-Ahpt9KvD0mWeWiyaGo5EBE7KOByLl3jl4CD9Ps/r8qySgzVzo/4qsa+vvstOU3ZEriALmrPqUKIhqHt0Rn+m6g== - dependencies: - tslib "^2.5.0" - "@solana/buffer-layout@^4.0.0": version "4.0.1" resolved "https://registry.yarnpkg.com/@solana/buffer-layout/-/buffer-layout-4.0.1.tgz#b996235eaec15b1e0b5092a8ed6028df77fa6c15" @@ -7699,17 +7621,6 @@ ajv@^8.0.0, ajv@^8.9.0: require-from-string "^2.0.2" uri-js "^4.2.2" -amazon-cognito-identity-js@^6.0.1: - version "6.3.2" - resolved "https://registry.yarnpkg.com/amazon-cognito-identity-js/-/amazon-cognito-identity-js-6.3.2.tgz#48a216d3e151dda40f97d1765446bcba7fcc820f" - integrity sha512-g1MqdAuvIsUtzI4b9gqusk/J5hH93XVlTV4/pjWb2cKnsWJfyMo/52EKWJL5dI2cp37dZhXt/xS1l9me42ENDg== - dependencies: - "@aws-crypto/sha256-js" "1.2.2" - buffer "4.9.2" - fast-base64-decode "^1.0.0" - isomorphic-unfetch "^3.0.0" - js-cookie "^2.2.1" - ansi-align@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" @@ -8079,13 +7990,6 @@ async-mutex@^0.2.6: dependencies: tslib "^2.0.0" -async-retry@^1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.3.tgz#0e7f36c04d8478e7a58bdbed80cedf977785f280" - integrity sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw== - dependencies: - retry "0.13.1" - async@^2.6.4: version "2.6.4" resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" @@ -8168,14 +8072,7 @@ axe-core@^4.4.3: resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.7.2.tgz#040a7342b20765cb18bb50b628394c21bccc17a0" integrity sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g== -axios@^0.21.2: - version "0.21.4" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" - integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== - dependencies: - follow-redirects "^1.14.0" - -axios@^1.0.0, axios@^1.4.0: +axios@^1.0.0: version "1.4.0" resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f" integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA== @@ -8866,15 +8763,6 @@ buffer-xor@^1.0.3: resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" integrity sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ== -buffer@4.9.2, buffer@^4.3.0: - version "4.9.2" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" - integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg== - dependencies: - base64-js "^1.0.2" - ieee754 "^1.1.4" - isarray "^1.0.0" - buffer@6.0.3, buffer@^6.0.3, buffer@~6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" @@ -8883,6 +8771,15 @@ buffer@6.0.3, buffer@^6.0.3, buffer@~6.0.3: base64-js "^1.3.1" ieee754 "^1.2.1" +buffer@^4.3.0: + version "4.9.2" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" + integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg== + dependencies: + base64-js "^1.0.2" + ieee754 "^1.1.4" + isarray "^1.0.0" + buffer@^5.5.0, buffer@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" @@ -9115,13 +9012,6 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw== -cbor@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/cbor/-/cbor-9.0.1.tgz#b16e393d4948d44758cd54ac6151379d443b37ae" - integrity sha512-/TQOWyamDxvVIv+DY9cOLNuABkoyz8K/F3QE56539pGVYohx0+MEA1f4lChFTX79dBTBS7R1PF6ovH7G+VtBfQ== - dependencies: - nofilter "^3.1.0" - ccount@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043" @@ -9365,7 +9255,7 @@ cli-spinners@^2.5.0: resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.0.tgz#5881d0ad96381e117bbe07ad91f2008fe6ffd8db" integrity sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g== -cli-table3@^0.6.0, cli-table3@^0.6.1, cli-table3@~0.6.1: +cli-table3@^0.6.1, cli-table3@~0.6.1: version "0.6.3" resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2" integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg== @@ -9562,11 +9452,6 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== -compare-versions@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-6.1.0.tgz#3f2131e3ae93577df111dba133e6db876ffe127a" - integrity sha512-LNZQXhqUvqUTotpZ00qLSaify3b4VFD588aRr8MKFw4CMUr98ytzCW5wDH5qx/DEY5kCDXcbcRuCqL0szEf2tg== - component-emitter@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" @@ -11318,7 +11203,7 @@ ethereum-cryptography@^0.1.3: secp256k1 "^4.0.1" setimmediate "^1.0.5" -ethereumjs-util@^7.0.3, ethereumjs-util@^7.1.0: +ethereumjs-util@^7.1.0: version "7.1.5" resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz#9ecf04861e4fbbeed7465ece5f23317ad1129181" integrity sha512-SDl5kKrQAudFBUe5OJM9Ac6WmMyYmXX/6sTmLZ3ffG2eY6ZIGBes3pEDxNN6V72WyOw4CPD5RomKdsa8DAAwLg== @@ -11638,11 +11523,6 @@ eyes@^0.1.8: resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" integrity sha512-GipyPsXO1anza0AOZdy69Im7hGFCNB7Y/NGjDlZGJ3GJJLtwNSb2vrzYrTYJRrRloVx7pl+bhUaTB8yiccPvFQ== -fast-base64-decode@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fast-base64-decode/-/fast-base64-decode-1.0.0.tgz#b434a0dd7d92b12b43f26819300d2dafb83ee418" - integrity sha512-qwaScUgUGBYeDNRnbc/KyllVU88Jk1pRHPStuF/lO7B0/RTRLj7U0lkdTAutlBblY08rwZDff6tNU9cjv6j//Q== - fast-decode-uri-component@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz#46f8b6c22b30ff7a81357d4f59abfae938202543" @@ -11959,7 +11839,7 @@ flux@^4.0.1: fbemitter "^3.0.0" fbjs "^3.0.1" -follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.0: +follow-redirects@^1.0.0, follow-redirects@^1.15.0: version "1.15.2" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== @@ -12569,15 +12449,6 @@ handlebars@^4.7.7: optionalDependencies: uglify-js "^3.1.4" -hardhat-contract-sizer@^2.4.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/hardhat-contract-sizer/-/hardhat-contract-sizer-2.10.0.tgz#72646f43bfe50e9a5702c9720c9bc3e77d93a2c9" - integrity sha512-QiinUgBD5MqJZJh1hl1jc9dNnpJg7eE/w4/4GEnrcmZJJTDbVFNe3+/3Ep24XqISSkYxRz36czcPHKHd/a0dwA== - dependencies: - chalk "^4.0.0" - cli-table3 "^0.6.0" - strip-ansi "^6.0.0" - harmony-reflect@^1.4.6: version "1.6.2" resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710" @@ -13854,7 +13725,7 @@ isobject@^4.0.0: resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0" integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA== -isomorphic-unfetch@^3.0.0, isomorphic-unfetch@^3.1.0: +isomorphic-unfetch@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz#87341d5f4f7b63843d468438128cb087b7c3e98f" integrity sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q== @@ -14491,11 +14362,6 @@ jose@^4.11.4: resolved "https://registry.yarnpkg.com/jose/-/jose-4.14.4.tgz#59e09204e2670c3164ee24cbfe7115c6f8bff9ca" integrity sha512-j8GhLiKmUAh+dsFXlX1aJCbt5KMibuKb+d7j1JaOJG6s2UjX1PQlW+OKB/sD4a/5ZYF4RcmYmLSndOoU3Lt/3g== -js-cookie@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" - integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== - js-sha3@0.8.0, js-sha3@^0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840" @@ -15824,7 +15690,7 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" -minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.7: +minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -16079,7 +15945,7 @@ node-dir@^0.1.10: dependencies: minimatch "^3.0.2" -node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.12, node-fetch@^2.6.7: +node-fetch@^2.2.0, node-fetch@^2.6.1, node-fetch@^2.6.12, node-fetch@^2.6.7: version "2.6.12" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.12.tgz#02eb8e22074018e3d5a83016649d04df0e348fba" integrity sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g== @@ -16135,11 +16001,6 @@ node-releases@^2.0.13: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d" integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ== -nofilter@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-3.1.0.tgz#c757ba68801d41ff930ba2ec55bab52ca184aa66" - integrity sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g== - normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -17524,15 +17385,6 @@ prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.6.2, prop-types@^15.7.2, object-assign "^4.1.1" react-is "^16.13.1" -proper-lockfile@^4.1.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f" - integrity sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA== - dependencies: - graceful-fs "^4.2.4" - retry "^0.12.0" - signal-exit "^3.0.2" - property-information@^5.0.0, property-information@^5.3.0: version "5.6.0" resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69" @@ -18460,16 +18312,11 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== -retry@0.13.1, retry@^0.13.1: +retry@^0.13.1: version "0.13.1" resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== -retry@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" - integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== - reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" @@ -19139,11 +18986,6 @@ sockjs@^0.3.24: uuid "^8.3.2" websocket-driver "^0.7.4" -solidity-ast@^0.4.26: - version "0.4.49" - resolved "https://registry.yarnpkg.com/solidity-ast/-/solidity-ast-0.4.49.tgz#ecba89d10c0067845b7848c3a3e8cc61a4fc5b82" - integrity sha512-Pr5sCAj1SFqzwFZw1HPKSq0PehlQNdM8GwKyAVYh2DOn7/cCK8LUKD1HeHnKtTgBW7hi9h4nnnan7hpAg5RhWQ== - sonic-boom@^2.2.1: version "2.8.0" resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-2.8.0.tgz#c1def62a77425090e6ad7516aad8eb402e047611" @@ -20242,7 +20084,7 @@ tsconfig-paths@^3.14.1, tsconfig-paths@^3.9.0: minimist "^1.2.6" strip-bom "^3.0.0" -tslib@1.14.1, tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.0: +tslib@1.14.1, tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== From a45e4aa0e61951c8ad88163b4af2847df1731120 Mon Sep 17 00:00:00 2001 From: skuhlmann Date: Mon, 18 Dec 2023 14:20:45 -0700 Subject: [PATCH 06/10] comment out base --- libs/keychain-utils/src/contractKeychains.ts | 22 ++++++++++---------- libs/keychain-utils/src/endpoints.ts | 14 ++++++------- libs/keychain-utils/src/networkData.ts | 18 ++++++++-------- libs/keychain-utils/src/validNetworks.ts | 2 +- libs/keychain-utils/src/viemUtils.ts | 4 ++-- libs/tx-builder/src/utils/abi.ts | 2 +- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/libs/keychain-utils/src/contractKeychains.ts b/libs/keychain-utils/src/contractKeychains.ts index 70d7397a..45fd274e 100644 --- a/libs/keychain-utils/src/contractKeychains.ts +++ b/libs/keychain-utils/src/contractKeychains.ts @@ -9,7 +9,7 @@ export const CONTRACT_KEYCHAINS: Record = { '0x89': '0x8a4A9E36106Ee290811B89e06e2faFE913507965', '0xa': '0x84561C97156a128662B62952890469214FDC87bf', '0xa4b1': '0x8a4A9E36106Ee290811B89e06e2faFE913507965', - '0x2105': '0x97Aaa5be8B38795245f1c38A883B44cccdfB3E11', + // '0x2105': '0x97Aaa5be8B38795245f1c38A883B44cccdfB3E11', }, V3_FACTORY_ORIGINAL: { '0x1': '0x7e988A9db2F8597735fc68D21060Daed948a3e8C', @@ -19,7 +19,7 @@ export const CONTRACT_KEYCHAINS: Record = { '0x89': '0x7e988A9db2F8597735fc68D21060Daed948a3e8C', '0xa': '0x3E0eAdE343Ddc556a6Cf0f858e4f685ba303ce71', '0xa4b1': '0xb08Cc8C343cF6dC20d8cf51Fb2D6C436c6390dAa', - '0x2105': '0x22e0382194AC1e9929E023bBC2fD2BA6b778E098', + // '0x2105': '0x22e0382194AC1e9929E023bBC2fD2BA6b778E098', }, LOOT_SINGLETON: { '0x1': '0x0444AE984b9563C8480244693ED65F25B3C64a4E', @@ -29,7 +29,7 @@ export const CONTRACT_KEYCHAINS: Record = { '0x89': '0x0444AE984b9563C8480244693ED65F25B3C64a4E', '0xa': '0x0444AE984b9563C8480244693ED65F25B3C64a4E', '0xa4b1': '0x0444AE984b9563C8480244693ED65F25B3C64a4E', - '0x2105': '0x52acf023d38A31f7e7bC92cCe5E68d36cC9752d6', + // '0x2105': '0x52acf023d38A31f7e7bC92cCe5E68d36cC9752d6', }, SHARES_SINGLETON: { '0x1': '0x8124Cbb807A7b64123F3dEc3EF64995d8B10d3Eb', @@ -39,7 +39,7 @@ export const CONTRACT_KEYCHAINS: Record = { '0x89': '0x8124Cbb807A7b64123F3dEc3EF64995d8B10d3Eb', '0xa': '0x8124Cbb807A7b64123F3dEc3EF64995d8B10d3Eb', '0xa4b1': '0x8124Cbb807A7b64123F3dEc3EF64995d8B10d3Eb', - '0x2105': '0xc650B598b095613cCddF0f49570FfA475175A5D5', + // '0x2105': '0xc650B598b095613cCddF0f49570FfA475175A5D5', }, BAAL_SINGLETON: { '0x1': '0x5DcE1044A7E2E35D6524001796cee47252f18411', @@ -49,7 +49,7 @@ export const CONTRACT_KEYCHAINS: Record = { '0x89': '0x5DcE1044A7E2E35D6524001796cee47252f18411', '0xa': '0x69f4D1788e39c87893C980c06EdF4b7f686e2938', '0xa4b1': '0x17234C0Ae25AF09fAf57B9D5ea2B93C1f220E800', - '0x2105': '0xE0F33E95aF46EAd1Fe181d2A74919bff903cD5d4', + // '0x2105': '0xE0F33E95aF46EAd1Fe181d2A74919bff903cD5d4', }, GNOSIS_MULTISEND: { '0x1': '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761', @@ -59,7 +59,7 @@ export const CONTRACT_KEYCHAINS: Record = { '0x89': '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761', '0xa': '0x998739BFdAAdde7C933B942a68053933098f9EDa', '0xa4b1': '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761', - '0x2105': '0x998739BFdAAdde7C933B942a68053933098f9EDa', + // '0x2105': '0x998739BFdAAdde7C933B942a68053933098f9EDa', }, GNOSIS_SIGNLIB: { '0x1': '0xA65387F16B013cf2Af4605Ad8aA5ec25a2cbA3a2', @@ -69,7 +69,7 @@ export const CONTRACT_KEYCHAINS: Record = { '0x89': '0xA65387F16B013cf2Af4605Ad8aA5ec25a2cbA3a2', '0xa': '0x98FFBBF51bb33A056B08ddf711f289936AafF717', '0xa4b1': '0xA65387F16B013cf2Af4605Ad8aA5ec25a2cbA3a2', - '0x2105': '0x98FFBBF51bb33A056B08ddf711f289936AafF717', + // '0x2105': '0x98FFBBF51bb33A056B08ddf711f289936AafF717', }, TRIBUTE_MINION: { '0x1': '0x5c17BFBaB751C5ddF1Ff267acF8fF919537F39Cf', @@ -79,7 +79,7 @@ export const CONTRACT_KEYCHAINS: Record = { '0x89': '0x51498dDdd2A8cdeC82932E08A37eBaF346C38EFd', '0xa': '0x7707964B4C24A6b8b7B747F7507F56818857A7C2', '0xa4b1': '0x7707964B4C24A6b8b7B747F7507F56818857A7C2', - '0x2105': '0x00768B047f73D88b6e9c14bcA97221d6E179d468', + // '0x2105': '0x00768B047f73D88b6e9c14bcA97221d6E179d468', }, POSTER: { '0x1': '0x000000000000cd17345801aa8147b8d3950260ff', @@ -89,7 +89,7 @@ export const CONTRACT_KEYCHAINS: Record = { '0x89': '0x000000000000cd17345801aa8147b8d3950260ff', '0xa': '0x000000000000cd17345801aa8147b8d3950260ff', '0xa4b1': '0x000000000000cd17345801aa8147b8d3950260ff', - '0x2105': '0x000000000000cd17345801aa8147b8D3950260FF', + // '0x2105': '0x000000000000cd17345801aa8147b8D3950260FF', }, VAULT_SUMMONER: { '0x1': '0x594E630efbe8dbd810c168e3878817a4094bB312', @@ -99,7 +99,7 @@ export const CONTRACT_KEYCHAINS: Record = { '0x89': '0x594E630efbe8dbd810c168e3878817a4094bB312', '0xa': '0xb04111e7b4576164145EF97EB81fd43DA0F2D675', '0xa4b1': '0xC39E8D4DE75c6aC025a0C07dCd8Aeb0728C5DBF1', - '0x2105': '0x2eF2fC8a18A914818169eFa183db480d31a90c5D', + // '0x2105': '0x2eF2fC8a18A914818169eFa183db480d31a90c5D', }, ZODIAC_FACTORY: { '0x1': '0x00000000000DC7F163742Eb4aBEf650037b1f588', @@ -109,6 +109,6 @@ export const CONTRACT_KEYCHAINS: Record = { '0x89': '0x00000000000DC7F163742Eb4aBEf650037b1f588', '0xa': '0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC', '0xa4b1': '0x00000000000DC7F163742Eb4aBEf650037b1f588', - '0x2105': '0x000000000000aDdB49795b0f9bA5BC298cDda236', + // '0x2105': '0x000000000000aDdB49795b0f9bA5BC298cDda236', }, }; diff --git a/libs/keychain-utils/src/endpoints.ts b/libs/keychain-utils/src/endpoints.ts index 3f5ec48f..cc7ae526 100644 --- a/libs/keychain-utils/src/endpoints.ts +++ b/libs/keychain-utils/src/endpoints.ts @@ -15,7 +15,7 @@ export const ENDPOINTS: KeychainList = { 'https://api.thegraph.com/subgraphs/name/hausdao/daohaus-v3-arbitrum', '0xaa36a7': 'https://api.thegraph.com/subgraphs/name/hausdao/daohaus-v3-sepolia', - '0x2105': 'https://api.thegraph.com/subgraphs/name/hausdao/daohaus-v3-base', + // '0x2105': 'https://api.thegraph.com/subgraphs/name/hausdao/daohaus-v3-base', }, EXPLORER: { '0x1': 'https://etherscan.io', @@ -25,7 +25,7 @@ export const ENDPOINTS: KeychainList = { '0xa': 'https://optimistic.etherscan.io', '0xa4b1': 'https://arbiscan.io', '0xaa36a7': 'https://sepolia.etherscan.io', - '0x2105': 'https://basescan.org', + // '0x2105': 'https://basescan.org', }, GNOSIS_API: { '0x1': 'https://safe-transaction-mainnet.safe.global/api/v1', @@ -35,7 +35,7 @@ export const ENDPOINTS: KeychainList = { '0xa': 'https://safe-transaction-optimism.safe.global/api/v1', '0xa4b1': 'https://safe-transaction-arbitrum.safe.global/api/v1', '0xaa36a7': 'https://safe-transaction-sepolia.safe.global/api/v1', - '0x2105': 'https://safe-transaction-base.safe.global/api/v1', + // '0x2105': 'https://safe-transaction-base.safe.global/api/v1', }, GNOSIS_SAFE_UI: { '0x1': 'https://app.safe.global/eth', @@ -45,7 +45,7 @@ export const ENDPOINTS: KeychainList = { '0xa': 'https://app.safe.global/oeth', '0xa4b1': 'https://app.safe.global/arb', '0xaa36a7': 'https://app.safe.global/sep', - '0x2105': 'https://app.safe.global/base', + // '0x2105': 'https://app.safe.global/base', }, TABULA_GRAPH: { '0x5': @@ -101,7 +101,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': '**TODO', + // '0x2105': '**TODO', }; export const HAUS_RPC = { '0x1': process.env['NX_MAINNET_RPC'] @@ -125,7 +125,7 @@ export const HAUS_RPC = { '0xaa36a7': process.env['NX_SEPOLIA_RPC'] ? process.env['NX_SEPOLIA_RPC'] : HAUS_RPC_DEFAULTS['0xaa36a7'], - '0x2105': '**TODO', + // '0x2105': '**TODO', }; export const GRAPH_API_KEYS = { '0x1': process.env['NX_GRAPH_API_KEY_MAINNET'], @@ -148,5 +148,5 @@ export const ABI_EXPLORER_KEYS: Keychain = { '0xa': process.env['NX_OPTIMISMSCAN_KEY'], '0xa4b1': process.env['NX_ARBISCAN_KEY'], '0xaa36a7': process.env['NX_ETHERSCAN_KEY'], - '0x2105': '**TODO', + // '0x2105': '**TODO', }; diff --git a/libs/keychain-utils/src/networkData.ts b/libs/keychain-utils/src/networkData.ts index d3a5ab24..2217d0de 100644 --- a/libs/keychain-utils/src/networkData.ts +++ b/libs/keychain-utils/src/networkData.ts @@ -65,13 +65,13 @@ export const HAUS_NETWORK_DATA: Keychain = { explorer: ENDPOINTS.EXPLORER['0xaa36a7'] as string, rpc: HAUS_RPC['0xaa36a7'] as string, }, - '0x2105': { - chainId: '0x2105', - networkId: 8453, - name: 'Base', - symbol: 'ETH', - tokenDecimals: 18, - explorer: ENDPOINTS.EXPLORER['0x2105'] as string, - rpc: '**TODO', - }, + // '0x2105': { + // chainId: '0x2105', + // networkId: 8453, + // name: 'Base', + // symbol: 'ETH', + // tokenDecimals: 18, + // explorer: ENDPOINTS.EXPLORER['0x2105'] as string, + // rpc: '**TODO', + // }, }; diff --git a/libs/keychain-utils/src/validNetworks.ts b/libs/keychain-utils/src/validNetworks.ts index 451533ed..3dbd7a38 100644 --- a/libs/keychain-utils/src/validNetworks.ts +++ b/libs/keychain-utils/src/validNetworks.ts @@ -6,5 +6,5 @@ export const VALID_NETWORKS = { '0x89': true, '0xa4b1': true, '0xaa36a7': true, - '0x2105': false, + // '0x2105': false, }; diff --git a/libs/keychain-utils/src/viemUtils.ts b/libs/keychain-utils/src/viemUtils.ts index 4bb72cb8..7dfd7274 100644 --- a/libs/keychain-utils/src/viemUtils.ts +++ b/libs/keychain-utils/src/viemUtils.ts @@ -5,7 +5,7 @@ import { gnosis, goerli, optimism, - base, + // base, sepolia, Chain, } from 'wagmi/chains'; @@ -19,5 +19,5 @@ export const VIEM_CHAINS: Keychain = { '0xa': optimism, '0xa4b1': arbitrum, '0xaa36a7': sepolia, - '0x2105': base, + // '0x2105': base, }; diff --git a/libs/tx-builder/src/utils/abi.ts b/libs/tx-builder/src/utils/abi.ts index ba77f15a..2d2407c3 100644 --- a/libs/tx-builder/src/utils/abi.ts +++ b/libs/tx-builder/src/utils/abi.ts @@ -53,7 +53,7 @@ const getABIUrl = ({ '0xa': `https://api-optimistic.etherscan.io/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys[chainId]}`, '0xa4b1': `https://api.arbiscan.io/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apiKey=${explorerKeys[chainId]}`, '0xaa36a7': `https://api-sepolia.etherscan.io/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys[chainId]}`, - '0x2105': '**TODO', + // '0x2105': '**TODO', }; return TEMPORARY_ABI_EXPLORER[chainId]?.replace(ABI_ADDRESS, contractAddress); From 637f57b72acefc7ef24dff9b58378900f794cb43 Mon Sep 17 00:00:00 2001 From: Santiago Gonzalez Date: Wed, 3 Jan 2024 15:39:46 -0500 Subject: [PATCH 07/10] comment out base --- apps/summon-safe/src/utils/modules.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/summon-safe/src/utils/modules.ts b/apps/summon-safe/src/utils/modules.ts index 8193c98a..687d7a6d 100644 --- a/apps/summon-safe/src/utils/modules.ts +++ b/apps/summon-safe/src/utils/modules.ts @@ -50,7 +50,7 @@ export const MODULES: Record = { singletonAddress: '0x7c1Db931F804271E39b04E68221b71Ca94E9AFa5', }, }, - '0x2105': {}, + // '0x2105': {}, }, params: [ { @@ -191,7 +191,7 @@ export const MODULES: Record = { singletonAddress: '0x85C60D0674e161B7f9d1d40A2A46e4b788E7F057', }, }, - '0x2105': {}, + // '0x2105': {}, }, params: [ { @@ -283,7 +283,7 @@ export const MODULES: Record = { singletonAddress: '0x15f06a6dB8eC8D79Eaa49659210C1c58975a4056', }, }, - '0x2105': {}, + // '0x2105': {}, }, params: [ { @@ -368,7 +368,7 @@ export const MODULES: Record = { singletonAddress: '0x226E0601aa8b8CC34519c76Be00A7a6a8a4d97d2', }, }, - '0x2105': {}, + // '0x2105': {}, }, params: [ { @@ -449,7 +449,7 @@ export const MODULES: Record = { singletonAddress: '0x0C7F0fC0ddb95d7099ED97c10A2DE549c03E39F9', }, }, - '0x2105': {}, + // '0x2105': {}, }, params: [ { From 522fd3ac16e6de9bc9853e54ff9c3f5276a38fa3 Mon Sep 17 00:00:00 2001 From: Santiago Gonzalez Date: Wed, 3 Jan 2024 15:45:29 -0500 Subject: [PATCH 08/10] bump baal-contracts version --- package.json | 2 +- yarn.lock | 46 +++++++++++++++++++++++++++------------------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index e30af540..fbd7b54f 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.cd77847.0" }, "dependencies": { - "@daohaus/baal-contracts": "^1.2.14", + "@daohaus/baal-contracts": "^1.2.17", "@gnosis.pm/safe-apps-react-sdk": "^4.6.2", "@gnosis.pm/safe-apps-web3modal": "^17.0.2", "@gnosis.pm/safe-react-components": "^1.2.0", diff --git a/yarn.lock b/yarn.lock index dbe1ac0b..03c31834 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1426,15 +1426,16 @@ debug "^3.1.0" lodash.once "^4.1.1" -"@daohaus/baal-contracts@^1.2.14": - version "1.2.14" - resolved "https://registry.yarnpkg.com/@daohaus/baal-contracts/-/baal-contracts-1.2.14.tgz#9a2828ad6a514dde68289655fbbc928ddd4fb08c" - integrity sha512-v7DmtbjnOkqpEngp3Ta7M24S6nQqNYfJkuBfrBQEEzckhEjF+Z8dINZLEhP/FzFYbz2/fR2TE3Ku8q8qlf66pg== +"@daohaus/baal-contracts@^1.2.17": + version "1.2.17" + resolved "https://registry.yarnpkg.com/@daohaus/baal-contracts/-/baal-contracts-1.2.17.tgz#8d42fd3ae37677bd91e856902485f6f0c5c3aeb0" + integrity sha512-6DR0YNK62Gh+W+eGm8XA1OZiBhnUD870/bfmem/0KUR10NExqTEVTwm6BYSIPtkFBQKlD//w/ZiAWb3lUX1NQw== dependencies: "@gnosis.pm/zodiac" "^3.3.7" "@opengsn/contracts" "2.2.5" "@openzeppelin/contracts" "^4.8.0" "@openzeppelin/contracts-upgradeable" "^4.8.0" + safe-deployments "^1.26.0" "@discoveryjs/json-ext@^0.5.3": version "0.5.7" @@ -2133,14 +2134,14 @@ cross-fetch "^3.1.5" "@gnosis.pm/zodiac@^3.3.7": - version "3.3.7" - resolved "https://registry.yarnpkg.com/@gnosis.pm/zodiac/-/zodiac-3.3.7.tgz#ad12a73ec7208376242596bd140c56ed370e0e66" - integrity sha512-Sgh5i1I2AyS5TxlYoosRHdj4cmJzK+3c5GTfrh0y7x4nKTpqNNuTYLbSEZ8EBcyWDfkDSnHYus6ZZqPSSqC0PQ== + version "3.5.0" + resolved "https://registry.yarnpkg.com/@gnosis.pm/zodiac/-/zodiac-3.5.0.tgz#5460e1147f1af3ccada35afd5a96edbefbd18039" + integrity sha512-5qnbhXchVXjQRAgmdqiJbsjHl/V3evVb269pT3J20+YzspYQbOR7IaZOGLmUFlKhkh8+k8E6MkU8qwXnINv0yw== dependencies: "@gnosis.pm/mock-contract" "^4.0.0" "@gnosis.pm/safe-contracts" "1.3.0" - "@openzeppelin/contracts" "^4.8.1" - "@openzeppelin/contracts-upgradeable" "^4.8.1" + "@openzeppelin/contracts" "^5.0.0" + "@openzeppelin/contracts-upgradeable" "^5.0.0" ethers "^5.7.1" "@graphprotocol/graph-ts@^0.28.1": @@ -3754,21 +3755,21 @@ resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.9.5.tgz#572b5da102fc9be1d73f34968e0ca56765969812" integrity sha512-f7L1//4sLlflAN7fVzJLoRedrf5Na3Oal5PZfIq55NFcVZ90EpV1q5xOvL4lFvg3MNICSDr2hH0JUBxwlxcoPg== -"@openzeppelin/contracts-upgradeable@^4.8.1": - version "4.9.3" - resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.9.3.tgz#ff17a80fb945f5102571f8efecb5ce5915cc4811" - integrity sha512-jjaHAVRMrE4UuZNfDwjlLGDxTHWIOwTJS2ldnc278a0gevfXfPr8hxKEVBGFBE96kl2G3VHDZhUimw/+G3TG2A== - -"@openzeppelin/contracts@^4.2.0", "@openzeppelin/contracts@^4.8.1": - version "4.9.3" - resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.3.tgz#00d7a8cf35a475b160b3f0293a6403c511099364" - integrity sha512-He3LieZ1pP2TNt5JbkPA4PNT9WC3gOTOlDcFGJW4Le4QKqwmiNJCRt44APfxMxvq7OugU/cqYuPcSBzOw38DAg== +"@openzeppelin/contracts-upgradeable@^5.0.0": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-5.0.1.tgz#ebc163cbed2de6b8b69bff628261d18deb912a81" + integrity sha512-MvaLoPnVcoZr/qqZP+4cl9piuR4gg0iIGgxVSZ/AL1iId3M6IdEHzz9Naw5Lirl4KKBI6ciTVnX07yL4dOMIJg== -"@openzeppelin/contracts@^4.8.0": +"@openzeppelin/contracts@^4.2.0", "@openzeppelin/contracts@^4.8.0": version "4.9.5" resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.5.tgz#1eed23d4844c861a1835b5d33507c1017fa98de8" integrity sha512-ZK+W5mVhRppff9BE6YdR8CC52C8zAvsVAiWhEtQ5+oNxFE6h1WdeWo+FJSF8KKvtxxVYZ7MTP/5KoVpAU3aSWg== +"@openzeppelin/contracts@^5.0.0": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.0.1.tgz#93da90fc209a0a4ff09c1deb037fbb35e4020890" + integrity sha512-yQJaT5HDp9hYOOp4jTYxMsR02gdFZFXhewX5HW9Jo4fsqSVqqyIO/xTHdWDaKX5a3pv1txmf076Lziz+sO7L1w== + "@parcel/watcher@2.0.4": version "2.0.4" resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.4.tgz#f300fef4cc38008ff4b8c29d92588eced3ce014b" @@ -18517,6 +18518,13 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +safe-deployments@^1.26.0: + version "1.26.0" + resolved "https://registry.yarnpkg.com/safe-deployments/-/safe-deployments-1.26.0.tgz#ac93849dfe187d5abe4f448a113ffac5ca2bd4b6" + integrity sha512-JuUfoN86/JPmmGAxxVj73Q0G7Pkon3tZMu7IgWWd4SSPk4bvoSJCaQBOHFKRu10x2+KQUtK+xz0JIua6QB6niA== + dependencies: + semver "^7.3.7" + safe-identifier@^0.4.2: version "0.4.2" resolved "https://registry.yarnpkg.com/safe-identifier/-/safe-identifier-0.4.2.tgz#cf6bfca31c2897c588092d1750d30ef501d59fcb" From f3f3daedb071134c31eb0947a06bc1efca82a94e Mon Sep 17 00:00:00 2001 From: skuhlmann Date: Tue, 9 Jan 2024 08:54:42 -0700 Subject: [PATCH 09/10] fixes sepolia subgraph target contract address --- apps/moloch-v3-subgraph/manifests/config.js | 16 +- apps/moloch-v3-subgraph/subgraph.yaml | 52 +- libs/moloch-v3-legos/src/gnosisModule.json | 631 ++++++++++++++++++++ 3 files changed, 647 insertions(+), 52 deletions(-) create mode 100644 libs/moloch-v3-legos/src/gnosisModule.json diff --git a/apps/moloch-v3-subgraph/manifests/config.js b/apps/moloch-v3-subgraph/manifests/config.js index 4ab2f70f..08a8a048 100644 --- a/apps/moloch-v3-subgraph/manifests/config.js +++ b/apps/moloch-v3-subgraph/manifests/config.js @@ -319,16 +319,10 @@ module.exports.config = { }, sepolia: { dataSources: [ - { - name: 'baalSummoner-v1.0.0', - template: 'baal-summoner-ds.yaml', - address: '0xD69e5B8F6FA0E5d94B93848700655A78DF24e387', - startBlock: 4816767, - }, { name: 'baalSummoner-v2.0.0', template: 'baal-summoner-2.0.0-ds.yaml', - address: '0xD69e5B8F6FA0E5d94B93848700655A78DF24e387', + address: '0xB2B3909661552942AE1115E9Fc99dF0BC93d71d0', startBlock: 4816767, }, { @@ -367,16 +361,10 @@ module.exports.config = { }, base: { dataSources: [ - { - name: 'baalSummoner-v1.0.0', - template: 'baal-summoner-ds.yaml', - address: '0x22e0382194AC1e9929E023bBC2fD2BA6b778E098', - startBlock: 7428979, - }, { name: 'baalSummoner-v2.0.0', template: 'baal-summoner-2.0.0-ds.yaml', - address: '0x97Aaa5be8B38795245f1c38A883B44cccdfB3E11', + address: '0x22e0382194AC1e9929E023bBC2fD2BA6b778E098', startBlock: 7428979, }, { diff --git a/apps/moloch-v3-subgraph/subgraph.yaml b/apps/moloch-v3-subgraph/subgraph.yaml index 949a623c..a927f2a3 100644 --- a/apps/moloch-v3-subgraph/subgraph.yaml +++ b/apps/moloch-v3-subgraph/subgraph.yaml @@ -4,37 +4,13 @@ repository: https://github.com/hausdao/daohaus-v3-subgraph-sandbox schema: file: ./schema.graphql dataSources: - - kind: ethereum/contract - name: BaalSummoner - network: base - source: - address: '0x22e0382194AC1e9929E023bBC2fD2BA6b778E098' - abi: BaalSummoner - startBlock: 7428979 - mapping: - kind: ethereum/events - apiVersion: 0.0.6 - language: wasm/assemblyscript - entities: - - Dao - abis: - - name: BaalSummoner - file: ./abis/BaalSummoner.json - - name: Erc20 - file: ./abis/Erc20.json - eventHandlers: - - event: >- - SummonBaal(indexed address,indexed address,indexed - address,address,bool) - handler: handleSummonBaal - file: ./src/baal-summoner-mapping.ts - kind: ethereum/contract name: BaalSummonerV2 - network: base + network: sepolia source: - address: '0x97Aaa5be8B38795245f1c38A883B44cccdfB3E11' + address: '0xB2B3909661552942AE1115E9Fc99dF0BC93d71d0' abi: BaalSummonerV2 - startBlock: 7428979 + startBlock: 4816767 mapping: kind: ethereum/events apiVersion: 0.0.6 @@ -56,11 +32,11 @@ dataSources: file: ./src/baal-summoner-mapping.ts - kind: ethereum/contract name: VaultSummoner - network: base + network: sepolia source: - address: '0x2eF2fC8a18A914818169eFa183db480d31a90c5D' + address: '0x763f5c2E59f997A6cC48Bf1228aBf61325244702' abi: VaultSummoner - startBlock: 7428979 + startBlock: 4816767 mapping: kind: ethereum/events apiVersion: 0.0.6 @@ -78,11 +54,11 @@ dataSources: file: ./src/vault-summoner-mapping.ts - kind: ethereum/contract name: Poster - network: base + network: sepolia source: address: '0x000000000000cd17345801aa8147b8d3950260ff' abi: Poster - startBlock: 7428979 + startBlock: 4816767 mapping: kind: ethereum/events apiVersion: 0.0.6 @@ -99,11 +75,11 @@ dataSources: file: ./src/poster-mapping.ts - kind: ethereum/contract name: TributeMinion - network: base + network: sepolia source: - address: '0x00768B047f73D88b6e9c14bcA97221d6E179d468' + address: '0xdb4D89F2199b9Cf451B7Ff4bdC94b1c96De4bdD0' abi: TributeMinion - startBlock: 7428979 + startBlock: 4816767 mapping: kind: ethereum/events apiVersion: 0.0.6 @@ -124,7 +100,7 @@ dataSources: templates: - kind: ethereum/contract name: BaalTemplate - network: base + network: sepolia source: abi: Baal mapping: @@ -173,7 +149,7 @@ templates: handler: handleLockManager - kind: ethereum/contract name: SharesTemplate - network: base + network: sepolia source: abi: Shares mapping: @@ -196,7 +172,7 @@ templates: handler: handleSharesTransfer - kind: ethereum/contract name: LootTemplate - network: base + network: sepolia source: abi: Loot mapping: diff --git a/libs/moloch-v3-legos/src/gnosisModule.json b/libs/moloch-v3-legos/src/gnosisModule.json new file mode 100644 index 00000000..9e1759a4 --- /dev/null +++ b/libs/moloch-v3-legos/src/gnosisModule.json @@ -0,0 +1,631 @@ +[ + { "inputs": [], "stateMutability": "nonpayable", "type": "constructor" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "owner", + "type": "address" + } + ], + "name": "AddedOwner", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "bytes32", + "name": "approvedHash", + "type": "bytes32" + }, + { + "indexed": true, + "internalType": "address", + "name": "owner", + "type": "address" + } + ], + "name": "ApproveHash", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "handler", + "type": "address" + } + ], + "name": "ChangedFallbackHandler", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "guard", + "type": "address" + } + ], + "name": "ChangedGuard", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "uint256", + "name": "threshold", + "type": "uint256" + } + ], + "name": "ChangedThreshold", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "module", + "type": "address" + } + ], + "name": "DisabledModule", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "module", + "type": "address" + } + ], + "name": "EnabledModule", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "bytes32", + "name": "txHash", + "type": "bytes32" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "payment", + "type": "uint256" + } + ], + "name": "ExecutionFailure", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "module", + "type": "address" + } + ], + "name": "ExecutionFromModuleFailure", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "module", + "type": "address" + } + ], + "name": "ExecutionFromModuleSuccess", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "bytes32", + "name": "txHash", + "type": "bytes32" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "payment", + "type": "uint256" + } + ], + "name": "ExecutionSuccess", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "owner", + "type": "address" + } + ], + "name": "RemovedOwner", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "sender", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "value", + "type": "uint256" + } + ], + "name": "SafeReceived", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "initiator", + "type": "address" + }, + { + "indexed": false, + "internalType": "address[]", + "name": "owners", + "type": "address[]" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "threshold", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "address", + "name": "initializer", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "fallbackHandler", + "type": "address" + } + ], + "name": "SafeSetup", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "bytes32", + "name": "msgHash", + "type": "bytes32" + } + ], + "name": "SignMsg", + "type": "event" + }, + { "stateMutability": "nonpayable", "type": "fallback" }, + { + "inputs": [], + "name": "VERSION", + "outputs": [{ "internalType": "string", "name": "", "type": "string" }], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address", "name": "owner", "type": "address" }, + { "internalType": "uint256", "name": "_threshold", "type": "uint256" } + ], + "name": "addOwnerWithThreshold", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { "internalType": "bytes32", "name": "hashToApprove", "type": "bytes32" } + ], + "name": "approveHash", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address", "name": "", "type": "address" }, + { "internalType": "bytes32", "name": "", "type": "bytes32" } + ], + "name": "approvedHashes", + "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { "internalType": "uint256", "name": "_threshold", "type": "uint256" } + ], + "name": "changeThreshold", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { "internalType": "bytes32", "name": "dataHash", "type": "bytes32" }, + { "internalType": "bytes", "name": "data", "type": "bytes" }, + { "internalType": "bytes", "name": "signatures", "type": "bytes" }, + { + "internalType": "uint256", + "name": "requiredSignatures", + "type": "uint256" + } + ], + "name": "checkNSignatures", + "outputs": [], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { "internalType": "bytes32", "name": "dataHash", "type": "bytes32" }, + { "internalType": "bytes", "name": "data", "type": "bytes" }, + { "internalType": "bytes", "name": "signatures", "type": "bytes" } + ], + "name": "checkSignatures", + "outputs": [], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address", "name": "prevModule", "type": "address" }, + { "internalType": "address", "name": "module", "type": "address" } + ], + "name": "disableModule", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "domainSeparator", + "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address", "name": "module", "type": "address" } + ], + "name": "enableModule", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address", "name": "to", "type": "address" }, + { "internalType": "uint256", "name": "value", "type": "uint256" }, + { "internalType": "bytes", "name": "data", "type": "bytes" }, + { + "internalType": "enum Enum.Operation", + "name": "operation", + "type": "uint8" + }, + { "internalType": "uint256", "name": "safeTxGas", "type": "uint256" }, + { "internalType": "uint256", "name": "baseGas", "type": "uint256" }, + { "internalType": "uint256", "name": "gasPrice", "type": "uint256" }, + { "internalType": "address", "name": "gasToken", "type": "address" }, + { + "internalType": "address", + "name": "refundReceiver", + "type": "address" + }, + { "internalType": "uint256", "name": "_nonce", "type": "uint256" } + ], + "name": "encodeTransactionData", + "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address", "name": "to", "type": "address" }, + { "internalType": "uint256", "name": "value", "type": "uint256" }, + { "internalType": "bytes", "name": "data", "type": "bytes" }, + { + "internalType": "enum Enum.Operation", + "name": "operation", + "type": "uint8" + }, + { "internalType": "uint256", "name": "safeTxGas", "type": "uint256" }, + { "internalType": "uint256", "name": "baseGas", "type": "uint256" }, + { "internalType": "uint256", "name": "gasPrice", "type": "uint256" }, + { "internalType": "address", "name": "gasToken", "type": "address" }, + { + "internalType": "address payable", + "name": "refundReceiver", + "type": "address" + }, + { "internalType": "bytes", "name": "signatures", "type": "bytes" } + ], + "name": "execTransaction", + "outputs": [{ "internalType": "bool", "name": "success", "type": "bool" }], + "stateMutability": "payable", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address", "name": "to", "type": "address" }, + { "internalType": "uint256", "name": "value", "type": "uint256" }, + { "internalType": "bytes", "name": "data", "type": "bytes" }, + { + "internalType": "enum Enum.Operation", + "name": "operation", + "type": "uint8" + } + ], + "name": "execTransactionFromModule", + "outputs": [{ "internalType": "bool", "name": "success", "type": "bool" }], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address", "name": "to", "type": "address" }, + { "internalType": "uint256", "name": "value", "type": "uint256" }, + { "internalType": "bytes", "name": "data", "type": "bytes" }, + { + "internalType": "enum Enum.Operation", + "name": "operation", + "type": "uint8" + } + ], + "name": "execTransactionFromModuleReturnData", + "outputs": [ + { "internalType": "bool", "name": "success", "type": "bool" }, + { "internalType": "bytes", "name": "returnData", "type": "bytes" } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "getChainId", + "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address", "name": "start", "type": "address" }, + { "internalType": "uint256", "name": "pageSize", "type": "uint256" } + ], + "name": "getModulesPaginated", + "outputs": [ + { "internalType": "address[]", "name": "array", "type": "address[]" }, + { "internalType": "address", "name": "next", "type": "address" } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "getOwners", + "outputs": [ + { "internalType": "address[]", "name": "", "type": "address[]" } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { "internalType": "uint256", "name": "offset", "type": "uint256" }, + { "internalType": "uint256", "name": "length", "type": "uint256" } + ], + "name": "getStorageAt", + "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "getThreshold", + "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address", "name": "to", "type": "address" }, + { "internalType": "uint256", "name": "value", "type": "uint256" }, + { "internalType": "bytes", "name": "data", "type": "bytes" }, + { + "internalType": "enum Enum.Operation", + "name": "operation", + "type": "uint8" + }, + { "internalType": "uint256", "name": "safeTxGas", "type": "uint256" }, + { "internalType": "uint256", "name": "baseGas", "type": "uint256" }, + { "internalType": "uint256", "name": "gasPrice", "type": "uint256" }, + { "internalType": "address", "name": "gasToken", "type": "address" }, + { + "internalType": "address", + "name": "refundReceiver", + "type": "address" + }, + { "internalType": "uint256", "name": "_nonce", "type": "uint256" } + ], + "name": "getTransactionHash", + "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address", "name": "module", "type": "address" } + ], + "name": "isModuleEnabled", + "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address", "name": "owner", "type": "address" } + ], + "name": "isOwner", + "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "nonce", + "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address", "name": "prevOwner", "type": "address" }, + { "internalType": "address", "name": "owner", "type": "address" }, + { "internalType": "uint256", "name": "_threshold", "type": "uint256" } + ], + "name": "removeOwner", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address", "name": "to", "type": "address" }, + { "internalType": "uint256", "name": "value", "type": "uint256" }, + { "internalType": "bytes", "name": "data", "type": "bytes" }, + { + "internalType": "enum Enum.Operation", + "name": "operation", + "type": "uint8" + } + ], + "name": "requiredTxGas", + "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address", "name": "handler", "type": "address" } + ], + "name": "setFallbackHandler", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address", "name": "guard", "type": "address" } + ], + "name": "setGuard", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address[]", "name": "_owners", "type": "address[]" }, + { "internalType": "uint256", "name": "_threshold", "type": "uint256" }, + { "internalType": "address", "name": "to", "type": "address" }, + { "internalType": "bytes", "name": "data", "type": "bytes" }, + { + "internalType": "address", + "name": "fallbackHandler", + "type": "address" + }, + { "internalType": "address", "name": "paymentToken", "type": "address" }, + { "internalType": "uint256", "name": "payment", "type": "uint256" }, + { + "internalType": "address payable", + "name": "paymentReceiver", + "type": "address" + } + ], + "name": "setup", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], + "name": "signedMessages", + "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "targetContract", + "type": "address" + }, + { "internalType": "bytes", "name": "calldataPayload", "type": "bytes" } + ], + "name": "simulateAndRevert", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address", "name": "prevOwner", "type": "address" }, + { "internalType": "address", "name": "oldOwner", "type": "address" }, + { "internalType": "address", "name": "newOwner", "type": "address" } + ], + "name": "swapOwner", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { "stateMutability": "payable", "type": "receive" } +] From d8fcb14dd3cd3a89546a1a18dab64fe1bddf105b Mon Sep 17 00:00:00 2001 From: skuhlmann Date: Wed, 17 Jan 2024 13:11:30 -0700 Subject: [PATCH 10/10] tests sepolia --- apps/moloch-v3-subgraph/README.md | 2 +- apps/moloch-v3-subgraph/manifests/header.yaml | 2 +- apps/moloch-v3-subgraph/subgraph.yaml | 44 +++++++++---------- libs/keychain-utils/src/contractKeychains.ts | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/apps/moloch-v3-subgraph/README.md b/apps/moloch-v3-subgraph/README.md index 3b9cd52a..b3a41d2e 100644 --- a/apps/moloch-v3-subgraph/README.md +++ b/apps/moloch-v3-subgraph/README.md @@ -37,7 +37,6 @@ To generate subgraph code, run the following command: `nx run moloch-v3-subgraph:graph-deploy --name=hausdao/daohaus-v3-arbitrum --network=arbitrum-one` `nx run moloch-v3-subgraph:graph-deploy --name=hausdao/daohaus-v3-polygon --network=matic` `nx run moloch-v3-subgraph:graph-deploy --name=hausdao/daohaus-v3-sepolia --network=sepolia` -`nx run moloch-v3-subgraph:graph-deploy --name=hausdao/daohaus-v3-base --network=base` ### mainnet and gnosis chain deployment to studio @@ -47,6 +46,7 @@ To generate subgraph code, run the following command: todo: get this nx command running with a version: `nx run moloch-v3-subgraph:graph-deploy-studio --name=daohaus-v3 --network=mainnet` `nx run moloch-v3-subgraph:graph-deploy-studio --name=daohaus-v3-gnosis --network=gnosis` +`nx run moloch-v3-subgraph:graph-deploy-studio --name=daohaus-v3-base --network=base` _These require installing the graph cli locally and auth tokens for deployment to the hosted service or studio subgraphs_ `npm install -g @graphprotocol/graph-cli` diff --git a/apps/moloch-v3-subgraph/manifests/header.yaml b/apps/moloch-v3-subgraph/manifests/header.yaml index b4909199..44900b5f 100644 --- a/apps/moloch-v3-subgraph/manifests/header.yaml +++ b/apps/moloch-v3-subgraph/manifests/header.yaml @@ -1,4 +1,4 @@ -specVersion: 0.0.2 +specVersion: 0.0.5 description: DAOHaus V3 Subgraph repository: https://github.com/hausdao/daohaus-v3-subgraph-sandbox schema: diff --git a/apps/moloch-v3-subgraph/subgraph.yaml b/apps/moloch-v3-subgraph/subgraph.yaml index a927f2a3..bb3808b0 100644 --- a/apps/moloch-v3-subgraph/subgraph.yaml +++ b/apps/moloch-v3-subgraph/subgraph.yaml @@ -1,4 +1,4 @@ -specVersion: 0.0.4 +specVersion: 0.0.5 description: DAOHaus V3 Subgraph repository: https://github.com/hausdao/daohaus-v3-subgraph-sandbox schema: @@ -6,14 +6,14 @@ schema: dataSources: - kind: ethereum/contract name: BaalSummonerV2 - network: sepolia + network: base source: - address: '0xB2B3909661552942AE1115E9Fc99dF0BC93d71d0' + address: '0x22e0382194AC1e9929E023bBC2fD2BA6b778E098' abi: BaalSummonerV2 - startBlock: 4816767 + startBlock: 7428979 mapping: kind: ethereum/events - apiVersion: 0.0.6 + apiVersion: 0.0.5 language: wasm/assemblyscript entities: - Dao @@ -32,14 +32,14 @@ dataSources: file: ./src/baal-summoner-mapping.ts - kind: ethereum/contract name: VaultSummoner - network: sepolia + network: base source: - address: '0x763f5c2E59f997A6cC48Bf1228aBf61325244702' + address: '0x2eF2fC8a18A914818169eFa183db480d31a90c5D' abi: VaultSummoner - startBlock: 4816767 + startBlock: 7428979 mapping: kind: ethereum/events - apiVersion: 0.0.6 + apiVersion: 0.0.5 language: wasm/assemblyscript entities: - Dao @@ -54,14 +54,14 @@ dataSources: file: ./src/vault-summoner-mapping.ts - kind: ethereum/contract name: Poster - network: sepolia + network: base source: address: '0x000000000000cd17345801aa8147b8d3950260ff' abi: Poster - startBlock: 4816767 + startBlock: 7428979 mapping: kind: ethereum/events - apiVersion: 0.0.6 + apiVersion: 0.0.5 language: wasm/assemblyscript entities: - Post @@ -75,14 +75,14 @@ dataSources: file: ./src/poster-mapping.ts - kind: ethereum/contract name: TributeMinion - network: sepolia + network: base source: - address: '0xdb4D89F2199b9Cf451B7Ff4bdC94b1c96De4bdD0' + address: '0x00768B047f73D88b6e9c14bcA97221d6E179d468' abi: TributeMinion - startBlock: 4816767 + startBlock: 7428979 mapping: kind: ethereum/events - apiVersion: 0.0.6 + apiVersion: 0.0.5 language: wasm/assemblyscript entities: - Proposal @@ -100,12 +100,12 @@ dataSources: templates: - kind: ethereum/contract name: BaalTemplate - network: sepolia + network: base source: abi: Baal mapping: kind: ethereum/events - apiVersion: 0.0.6 + apiVersion: 0.0.5 language: wasm/assemblyscript file: ./src/baal-mapping.ts entities: @@ -149,12 +149,12 @@ templates: handler: handleLockManager - kind: ethereum/contract name: SharesTemplate - network: sepolia + network: base source: abi: Shares mapping: kind: ethereum/events - apiVersion: 0.0.6 + apiVersion: 0.0.5 language: wasm/assemblyscript file: ./src/token-mapping.ts entities: @@ -172,12 +172,12 @@ templates: handler: handleSharesTransfer - kind: ethereum/contract name: LootTemplate - network: sepolia + network: base source: abi: Loot mapping: kind: ethereum/events - apiVersion: 0.0.6 + apiVersion: 0.0.5 language: wasm/assemblyscript file: ./src/token-mapping.ts entities: diff --git a/libs/keychain-utils/src/contractKeychains.ts b/libs/keychain-utils/src/contractKeychains.ts index 45fd274e..287e99fe 100644 --- a/libs/keychain-utils/src/contractKeychains.ts +++ b/libs/keychain-utils/src/contractKeychains.ts @@ -4,7 +4,7 @@ export const CONTRACT_KEYCHAINS: Record = { V3_FACTORY_ADV_TOKEN: { '0x1': '0x8a4A9E36106Ee290811B89e06e2faFE913507965', '0x5': '0xb0c5c96c3d21c1d58B98a5366dF0Af7AfcD94F95', - '0xaa36a7': '0xB2B3909661552942AE1115E9Fc99dF0BC93d71d0', + '0xaa36a7': '0xD69e5B8F6FA0E5d94B93848700655A78DF24e387', '0x64': '0x8a4A9E36106Ee290811B89e06e2faFE913507965', '0x89': '0x8a4A9E36106Ee290811B89e06e2faFE913507965', '0xa': '0x84561C97156a128662B62952890469214FDC87bf',