From e420fe5c08fa27a9c301bd2e6b19c5d24bde2c82 Mon Sep 17 00:00:00 2001 From: Christopher Cali Date: Mon, 6 Nov 2023 16:41:42 -0500 Subject: [PATCH 1/7] Update Connect Wallet button to show user logged in state --- apps/web/src/layouts/default-layout.vue | 134 +++++++++++++++++++----- 1 file changed, 109 insertions(+), 25 deletions(-) diff --git a/apps/web/src/layouts/default-layout.vue b/apps/web/src/layouts/default-layout.vue index 958b2ad6f..771cb7329 100644 --- a/apps/web/src/layouts/default-layout.vue +++ b/apps/web/src/layouts/default-layout.vue @@ -3,14 +3,16 @@ import { ref, onMounted, onUnmounted } from "vue" import router from "@/composables/router" import VueFeather from "vue-feather" import useAuth from "@/composables/auth" +import useFormat from "@/composables/format" import useScreenDimensions from "@/composables/screenDimensions" import useUser from "@/composables/user" import useWallets from "@/composables/wallets" import ConnectWalletsFlow from "@/components/ConnectWalletsFlow.vue" -const { screenWidth } = useScreenDimensions() const { logout } = useAuth() +const { convertString } = useFormat() +const { screenWidth } = useScreenDimensions() const { user } = useUser() const { detectInstalledWalletProviders } = useWallets() @@ -19,6 +21,7 @@ const openRouterMenu = ref(false) const openWalletsModal = ref(false) const show_setting_modal = ref(false) +const showUserAddressesModal = ref(false) async function handleConnectWalletButtonClick() { openWalletsModal.value = true @@ -48,6 +51,20 @@ const handleOutsideClick = (event: any) => { authFlowCardNumber.value = 1 } } + + const user_addresses_modal = document.getElementById("user_addresses_modal") + const connect_wallet_button = document.getElementById("connect_wallet_button") + if (user_addresses_modal && connect_wallet_button) { + if (showUserAddressesModal.value) { + if (!user_addresses_modal.contains(event.target)) { + showUserAddressesModal.value = false + } + } else { + if (connect_wallet_button.contains(event.target)) { + showUserAddressesModal.value = true + } + } + } } const doesScrollBarExist = ref(true) @@ -158,6 +175,7 @@ const toggleModal = (showModal: boolean) => {
+ - - -
+ +
+ +
+ +
-
@@ -243,6 +306,11 @@ const toggleModal = (showModal: boolean) => { \ No newline at end of file From 74a133266c7cb870ed11659c0b1221597d0fcd64 Mon Sep 17 00:00:00 2001 From: Christopher Cali Date: Mon, 6 Nov 2023 16:52:06 -0500 Subject: [PATCH 2/7] Add a star on user's primary address in dropdown --- apps/web/src/layouts/default-layout.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/web/src/layouts/default-layout.vue b/apps/web/src/layouts/default-layout.vue index 771cb7329..f4f2d9444 100644 --- a/apps/web/src/layouts/default-layout.vue +++ b/apps/web/src/layouts/default-layout.vue @@ -230,6 +230,13 @@ const toggleModal = (showModal: boolean) => {
{{ convertString(account.address) }}
+
  • Date: Mon, 6 Nov 2023 16:53:52 -0500 Subject: [PATCH 3/7] Add cursor-default to Goerli Testnet --- apps/web/src/layouts/default-layout.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/web/src/layouts/default-layout.vue b/apps/web/src/layouts/default-layout.vue index f4f2d9444..e9fd8a980 100644 --- a/apps/web/src/layouts/default-layout.vue +++ b/apps/web/src/layouts/default-layout.vue @@ -175,7 +175,9 @@ const toggleModal = (showModal: boolean) => {
    - +
    + Goerli Testnet +
    - - -
    -
      - +
      +
      • Log out @@ -402,10 +397,11 @@ body { .dropdown_list { display: flex; flex-direction: column; - align-items: center; padding: 10px 16px; gap: 12px; width: 100%; + margin-top: 2px; + margin-bottom: 2px; } .green_dot { width: 8px; diff --git a/apps/web/src/mockData/mock_transaction_data.ts b/apps/web/src/mockData/mock_transaction_data.ts index 95f1364f8..cc1f252c8 100644 --- a/apps/web/src/mockData/mock_transaction_data.ts +++ b/apps/web/src/mockData/mock_transaction_data.ts @@ -3,91 +3,91 @@ const txData = ref(null as any) export default function useTxData () { - function generateRandomBalance(index: number, walletAddress: string) { - if ( - walletAddress === "0xd557a5745d4560B24D36A68b52351ffF9c86A212" - ) { - const lowBound = 100 + index * 1.06 - const highBound = 200 + index * 1.06 - return Math.random() * (highBound - lowBound) + lowBound - } else if (walletAddress === "0x728474D29c2F81eb17a669a7582A2C17f1042b57") { - const lowBound = 180 + index * 1.15 - const highBound = 300 + index * 1.15 - return Math.random() * (highBound - lowBound) + lowBound + function generateRandomBalance(index: number, walletAddress: string) { + if ( + walletAddress === "0xd557a5745d4560B24D36A68b52351ffF9c86A212" + ) { + const lowBound = 100 + index * 1.06 + const highBound = 200 + index * 1.06 + return Math.random() * (highBound - lowBound) + lowBound + } else if (walletAddress === "0x728474D29c2F81eb17a669a7582A2C17f1042b57") { + const lowBound = 180 + index * 1.15 + const highBound = 300 + index * 1.15 + return Math.random() * (highBound - lowBound) + lowBound + } } - } - function generateRandomDate() { + function generateRandomDate() { // Generate a random date within the last two years - const startDate = new Date() - startDate.setFullYear(startDate.getFullYear() - 2) - const endDate = new Date() - const randomDate = new Date(startDate.getTime() + Math.random() * (endDate.getTime() - startDate.getTime())) + const startDate = new Date() + startDate.setFullYear(startDate.getFullYear() - 2) + const endDate = new Date() + const randomDate = new Date(startDate.getTime() + Math.random() * (endDate.getTime() - startDate.getTime())) - const year = randomDate.getFullYear() - const month = String(randomDate.getMonth() + 1).padStart(2, "0") - const day = String(randomDate.getDate()).padStart(2, "0") - const hours = String(randomDate.getHours()).padStart(2, "0") - const minutes = String(randomDate.getMinutes()).padStart(2, "0") - const seconds = String(randomDate.getSeconds()).padStart(2, "0") - const milliseconds = String(randomDate.getMilliseconds()).padStart(3, "0") + const year = randomDate.getFullYear() + const month = String(randomDate.getMonth() + 1).padStart(2, "0") + const day = String(randomDate.getDate()).padStart(2, "0") + const hours = String(randomDate.getHours()).padStart(2, "0") + const minutes = String(randomDate.getMinutes()).padStart(2, "0") + const seconds = String(randomDate.getSeconds()).padStart(2, "0") + const milliseconds = String(randomDate.getMilliseconds()).padStart(3, "0") - return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}:${milliseconds}` - } + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}:${milliseconds}` + } - function generateMockTransactionData(numTransactions: number) { - const walletAddresses = [ - "0xd557a5745d4560B24D36A68b52351ffF9c86A212", "0x728474D29c2F81eb17a669a7582A2C17f1042b57", - // '0x84725c8f954f18709aDcA150a0635D2fBE94fDfF', - // '0x2EFD9900b748EbFfe658662c1ED853982Bf86ED9', - // '0x9347155C4586f25306462EbA8BB8df7f06Bb5247', - // '0x79AE48EF1b199C586A05D1e3bC0f83fBe576d1ae', - // '0xBE5F02D2d08994288aCF53ddC47d8150d41fb3A8', - // '0xd3260De619cc58a6A61Dfa1DDDb52d760384f9a8', - // '0xFcB0d31595fB9bB641DeEE0E4E50050D613337C0', - // '0xc3178D118c54954b4811958916ca7B3b5D2cEDc5' - ] + function generateMockTransactionData(numTransactions: number) { + const walletAddresses = [ + "0xd557a5745d4560B24D36A68b52351ffF9c86A212", "0x728474D29c2F81eb17a669a7582A2C17f1042b57", + // '0x84725c8f954f18709aDcA150a0635D2fBE94fDfF', + // '0x2EFD9900b748EbFfe658662c1ED853982Bf86ED9', + // '0x9347155C4586f25306462EbA8BB8df7f06Bb5247', + // '0x79AE48EF1b199C586A05D1e3bC0f83fBe576d1ae', + // '0xBE5F02D2d08994288aCF53ddC47d8150d41fb3A8', + // '0xd3260De619cc58a6A61Dfa1DDDb52d760384f9a8', + // '0xFcB0d31595fB9bB641DeEE0E4E50050D613337C0', + // '0xc3178D118c54954b4811958916ca7B3b5D2cEDc5' + ] - const data = [] + const data = [] - for (let i = 0; i < numTransactions; i++) { - const transaction = { - walletAddress: walletAddresses[i % walletAddresses.length], - walletBalance: i, - txDirection: Math.random() < 0.5? "incoming": "outgoing", - txId: "0xf46d39ca96e489fb0eb2097f073bfde2dc7960bf8358e0692fa79cc8597d283e", - receivedAt: generateRandomDate(), - amount: (Math.random() * 20.00).toFixed(2), - price: (Math.random() * 2000.00).toFixed(2), - gasFee: (Math.random() * 10.00).toFixed(2), - stakeFee: (Math.random() * 10.00).toFixed(2), - rewards:(Math.random() * 10.00).toFixed(2), - status: Math.random() > 0.5? "Pending" : "Active", - type: Math.random() > 0.5? null : Math.random() > 0.5? "Stake SSV" : "Withdraw", - } - data.push(transaction) - } + for (let i = 0; i < numTransactions; i++) { + const transaction = { + walletAddress: walletAddresses[i % walletAddresses.length], + walletBalance: i, + txDirection: Math.random() < 0.5? "incoming": "outgoing", + txId: "0xf46d39ca96e489fb0eb2097f073bfde2dc7960bf8358e0692fa79cc8597d283e", + receivedAt: generateRandomDate(), + amount: (Math.random() * 20.00).toFixed(2), + price: (Math.random() * 2000.00).toFixed(2), + gasFee: (Math.random() * 10.00).toFixed(2), + stakeFee: (Math.random() * 10.00).toFixed(2), + rewards:(Math.random() * 10.00).toFixed(2), + status: Math.random() > 0.5? "Pending" : "Active", + type: Math.random() > 0.5? null : Math.random() > 0.5? "Stake SSV" : "Withdraw", + } + data.push(transaction) + } - data.sort((a, b) => { - return new Date(a.receivedAt).getTime() - new Date(b.receivedAt).getTime() - }) + data.sort((a, b) => { + return new Date(a.receivedAt).getTime() - new Date(b.receivedAt).getTime() + }) - for (let i = 0; i < data.length; i++) { - data[i].walletBalance = generateRandomBalance(i, data[i].walletAddress) as number - } + for (let i = 0; i < data.length; i++) { + data[i].walletBalance = generateRandomBalance(i, data[i].walletAddress) as number + } - return data - } + return data + } - const mockData = () => { - const numTransactions = 720 // Number of transactions to generate - const data = generateMockTransactionData(numTransactions) - // const jsonData = JSON.stringify(data, null, 2) + const mockData = () => { + const numTransactions = 720 // Number of transactions to generate + const data = generateMockTransactionData(numTransactions) + // const jsonData = JSON.stringify(data, null, 2) - txData.value = data - } - return { - txData, - mockData - } + txData.value = data + } + return { + txData, + mockData + } } \ No newline at end of file diff --git a/apps/web/src/pages/operators/Operator.vue b/apps/web/src/pages/operators/Operator.vue index ce78f68e1..208f6c52d 100644 --- a/apps/web/src/pages/operators/Operator.vue +++ b/apps/web/src/pages/operators/Operator.vue @@ -16,14 +16,14 @@ const { docsUrl } = useEnvironment() const { exportFile } = useFiles() const { convertString } = useFormat() const { - initializeOperatorComposable, - registerOperatorWithCasimir, - nonregisteredBaseOperators, - nonregisteredEigenOperators, - registeredBaseOperators, - registeredEigenOperators, - loadingInitializeOperators, - loadingAddOperator + initializeOperatorComposable, + registerOperatorWithCasimir, + nonregisteredBaseOperators, + nonregisteredEigenOperators, + registeredBaseOperators, + registeredEigenOperators, + loadingInitializeOperators, + loadingAddOperator } = useOperators() const { user } = useUser() @@ -31,9 +31,9 @@ const { user } = useUser() const selectedWallet = ref<{ address: string, walletProvider: ProviderString }>({ address: "", walletProvider: "" }) const openSelectWalletOptions = ref(false) const onSelectWalletBlur = () => { - setTimeout(() => { - openSelectWalletOptions.value = false - }, 200) + setTimeout(() => { + openSelectWalletOptions.value = false + }, 200) } const operatorType = ref<"base" | "eigen">("base") @@ -42,20 +42,20 @@ const eigenIsToggled = ref(false) // Determines the toggle state const toggleBackgroundColor = ref("#eee") // Initial color function toggleEigenLayerSupport() { - eigenIsToggled.value = !eigenIsToggled.value - toggleBackgroundColor.value = eigenIsToggled.value ? "green" : "#eee" - operatorType.value = eigenIsToggled.value ? "eigen" : "base" + eigenIsToggled.value = !eigenIsToggled.value + toggleBackgroundColor.value = eigenIsToggled.value ? "green" : "#eee" + operatorType.value = eigenIsToggled.value ? "eigen" : "base" - // Update stakeType - // stakeType.value = eigenIsToggled.value ? 'eigen' : 'base' + // Update stakeType + // stakeType.value = eigenIsToggled.value ? 'eigen' : 'base' } const selectedOperatorID = ref() const openSelectOperatorID = ref(false) const onSelectOperatorIDBlur = () => { - setTimeout(() => { - openSelectOperatorID.value = false - }, 200) + setTimeout(() => { + openSelectOperatorID.value = false + }, 200) } const availableOperatorIDs = ref([] as string[]) @@ -70,31 +70,31 @@ const searchInput = ref("") const selectedHeader = ref("walletProvider") const selectedOrientation = ref("ascending") const operatorTableHeaders = ref( - [ + [ // { // title: '', // value: 'blank_column' // }, - { - title: "Operator ID", - value: "id" - }, - { - title: "Wallet Address", - value: "walletAddress" - }, - { - title: "Collateral", - value: "collateral" - }, - { - title: "Active Validators", - value: "poolCount" - }, - { - title: "Node URL", - value: "nodeURL" - }, + { + title: "Operator ID", + value: "id" + }, + { + title: "Wallet Address", + value: "walletAddress" + }, + { + title: "Collateral", + value: "collateral" + }, + { + title: "Active Validators", + value: "poolCount" + }, + { + title: "Node URL", + value: "nodeURL" + }, // { // title: '', // value: 'deactivate' @@ -103,7 +103,7 @@ const operatorTableHeaders = ref( // title: '', // value: 'withdraw_collateral' // }, - ] + ] ) const allInputsValid = ref(false) @@ -115,200 +115,200 @@ const loading = ref(false) const submitButtonTxt = ref("Submit") onMounted(async () => { - if (user.value) { - loading.value = true - await initializeOperatorComposable() - - // Autofill disable - const disableAutofill = () => { - let inputs = document.getElementsByTagName("input") - for (let i = 0; i < inputs.length; i++) { - inputs[i].setAttribute("autocomplete", "off") - } - } + if (user.value) { + loading.value = true + await initializeOperatorComposable() - document.addEventListener("DOMContentLoaded", disableAutofill) + // Autofill disable + const disableAutofill = () => { + let inputs = document.getElementsByTagName("input") + for (let i = 0; i < inputs.length; i++) { + inputs[i].setAttribute("autocomplete", "off") + } + } - filterData() - } + document.addEventListener("DOMContentLoaded", disableAutofill) + + filterData() + } }) watch(user, async () => { - if (user.value) { - loading.value = true - await initializeOperatorComposable() + if (user.value) { + loading.value = true + await initializeOperatorComposable() - filterData() - } + filterData() + } }) watch(selectedWallet, async () => { - selectedOperatorID.value = "" - selectedPublicNodeURL.value = "" - selectedCollateral.value = "" - - if (selectedWallet.value.address === "") { - availableOperatorIDs.value = [] - } else if (operatorType.value === "base") { - if (nonregisteredBaseOperators.value && nonregisteredBaseOperators.value.length > 0) { - availableOperatorIDs.value = [...nonregisteredBaseOperators.value] - .filter((operator: any) => operator.ownerAddress === selectedWallet.value.address) - .map((operator: any) => operator.id) - } else if (nonregisteredEigenOperators.value && nonregisteredEigenOperators.value.length > 0) { - availableOperatorIDs.value = [...nonregisteredEigenOperators.value] - .filter((operator: any) => operator.ownerAddress === selectedWallet.value.address) - .map((operator: any) => operator.id) - } else { - availableOperatorIDs.value = [] + selectedOperatorID.value = "" + selectedPublicNodeURL.value = "" + selectedCollateral.value = "" + + if (selectedWallet.value.address === "") { + availableOperatorIDs.value = [] + } else if (operatorType.value === "base") { + if (nonregisteredBaseOperators.value && nonregisteredBaseOperators.value.length > 0) { + availableOperatorIDs.value = [...nonregisteredBaseOperators.value] + .filter((operator: any) => operator.ownerAddress === selectedWallet.value.address) + .map((operator: any) => operator.id) + } else if (nonregisteredEigenOperators.value && nonregisteredEigenOperators.value.length > 0) { + availableOperatorIDs.value = [...nonregisteredEigenOperators.value] + .filter((operator: any) => operator.ownerAddress === selectedWallet.value.address) + .map((operator: any) => operator.id) + } else { + availableOperatorIDs.value = [] + } } - } }) watch([registeredBaseOperators, registeredEigenOperators], () => { - loading.value = true - openAddOperatorModal.value = false - tableData.value = [...registeredBaseOperators.value, ...registeredEigenOperators.value].map((operator: any) => { - return { - id: operator.id, - walletAddress: operator.ownerAddress, - collateral: operator.collateral + " ETH", - poolCount: operator.poolCount, - nodeURL: operator.url - } - }) - filterData() + loading.value = true + openAddOperatorModal.value = false + tableData.value = [...registeredBaseOperators.value, ...registeredEigenOperators.value].map((operator: any) => { + return { + id: operator.id, + walletAddress: operator.ownerAddress, + collateral: operator.collateral + " ETH", + poolCount: operator.poolCount, + nodeURL: operator.url + } + }) + filterData() }) watch(openAddOperatorModal, () => { - if (openAddOperatorModal.value) { - selectedWallet.value = { address: user.value?.address as string, walletProvider: user.value?.walletProvider as ProviderString } - } + if (openAddOperatorModal.value) { + selectedWallet.value = { address: user.value?.address as string, walletProvider: user.value?.walletProvider as ProviderString } + } }) watch([searchInput, - selectedHeader, - selectedOrientation, - currentPage], () => { - filterData() + selectedHeader, + selectedOrientation, + currentPage], () => { + filterData() }) const openWalletsModal = () => { - const el = document.getElementById("connect_wallet_button") - if (el) { - el.click() - } + const el = document.getElementById("connect_wallet_button") + if (el) { + el.click() + } } const handleInputChangeCollateral = (event: any) => { - const value = event.target.value.replace(/[^\d.]/g, "") - const parts = value.split(".") - parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",") + const value = event.target.value.replace(/[^\d.]/g, "") + const parts = value.split(".") + parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",") - // Limit to two decimal places - if (parts[1] && parts[1].length > 2) { - parts[1] = parts[1].slice(0, 2) - } + // Limit to two decimal places + if (parts[1] && parts[1].length > 2) { + parts[1] = parts[1].slice(0, 2) + } - // Update the model value - selectedCollateral.value = parts.join(".") + // Update the model value + selectedCollateral.value = parts.join(".") } const filterData = () => { - loading.value = true - let filteredDataArray - - if (searchInput.value === "") { - filteredDataArray = tableData.value - } else { - const searchTerm = searchInput.value - filteredDataArray = tableData.value.filter((item: any) => { - return ( - // Might need to modify to match types each variable - // item.walletProvider?.toLowerCase().includes(searchTerm) - true - ) - }) - } + loading.value = true + let filteredDataArray - if (selectedHeader.value !== "" && selectedOrientation.value !== "") { - filteredDataArray = filteredDataArray.sort((a: any, b: any) => { - const valA = a[selectedHeader.value] - const valB = b[selectedHeader.value] + if (searchInput.value === "") { + filteredDataArray = tableData.value + } else { + const searchTerm = searchInput.value + filteredDataArray = tableData.value.filter((item: any) => { + return ( + // Might need to modify to match types each variable + // item.walletProvider?.toLowerCase().includes(searchTerm) + true + ) + }) + } - if (selectedOrientation.value === "ascending") { - return valA < valB ? -1 : valA > valB ? 1 : 0 - } else { - return valA > valB ? -1 : valA < valB ? 1 : 0 - } - }) - } - totalPages.value = Math.round(filteredDataArray.length / itemsPerPage.value) || 1 + if (selectedHeader.value !== "" && selectedOrientation.value !== "") { + filteredDataArray = filteredDataArray.sort((a: any, b: any) => { + const valA = a[selectedHeader.value] + const valB = b[selectedHeader.value] + + if (selectedOrientation.value === "ascending") { + return valA < valB ? -1 : valA > valB ? 1 : 0 + } else { + return valA > valB ? -1 : valA < valB ? 1 : 0 + } + }) + } + totalPages.value = Math.round(filteredDataArray.length / itemsPerPage.value) || 1 - const start = (currentPage.value - 1) * itemsPerPage.value - const end = start + itemsPerPage.value - filteredData.value = filteredDataArray.slice(start, end) as any - loading.value = false + const start = (currentPage.value - 1) * itemsPerPage.value + const end = start + itemsPerPage.value + filteredData.value = filteredDataArray.slice(start, end) as any + loading.value = false } const removeItemFromCheckedList = (item: any) => { - const index = checkedItems.value.indexOf(item) - if (index > -1) { - checkedItems.value.splice(index, 1) - } + const index = checkedItems.value.indexOf(item) + if (index > -1) { + checkedItems.value.splice(index, 1) + } } watch([selectedWallet, - selectedOperatorID, - selectedPublicNodeURL, - selectedCollateral], () => { - if (selectedWallet.value.address !== "" && selectedOperatorID.value !== undefined && selectedPublicNodeURL.value !== "" && selectedCollateral.value !== undefined) { - allInputsValid.value = true - } else { - allInputsValid.value = false - } + selectedOperatorID, + selectedPublicNodeURL, + selectedCollateral], () => { + if (selectedWallet.value.address !== "" && selectedOperatorID.value !== undefined && selectedPublicNodeURL.value !== "" && selectedCollateral.value !== undefined) { + allInputsValid.value = true + } else { + allInputsValid.value = false + } }) async function submitRegisterOperatorForm() { - const selectedAddress = selectedWallet.value.address - const selectedProvider = selectedWallet.value.walletProvider - - // const activeAddress = await detectActiveWalletAddress(selectedProvider) - // if (activeAddress !== selectedAddress) { - // return alert(`The account you selected is not the same as the one that is active in your ${selectedProvider} wallet. Please open your browser extension and select the account that you want to log in with.`) - // } - - try { - await registerOperatorWithCasimir({ - walletProvider: selectedWallet.value.walletProvider as ProviderString, - address: selectedWallet.value.address, - operatorId: parseInt(selectedOperatorID.value), - collateral: selectedCollateral.value, - nodeUrl: selectedPublicNodeURL.value - }) - openAddOperatorModal.value = false - } catch (error) { - console.log("Error in submitRegisterOperatorForm :>> ", error) - openAddOperatorModal.value = false - } + const selectedAddress = selectedWallet.value.address + const selectedProvider = selectedWallet.value.walletProvider + + // const activeAddress = await detectActiveWalletAddress(selectedProvider) + // if (activeAddress !== selectedAddress) { + // return alert(`The account you selected is not the same as the one that is active in your ${selectedProvider} wallet. Please open your browser extension and select the account that you want to log in with.`) + // } + + try { + await registerOperatorWithCasimir({ + walletProvider: selectedWallet.value.walletProvider as ProviderString, + address: selectedWallet.value.address, + operatorId: parseInt(selectedOperatorID.value), + collateral: selectedCollateral.value, + nodeUrl: selectedPublicNodeURL.value + }) + openAddOperatorModal.value = false + } catch (error) { + console.log("Error in submitRegisterOperatorForm :>> ", error) + openAddOperatorModal.value = false + } - if (selectedWallet.value.address === "") { - const primaryAccount = user.value?.accounts.find(item => { item.address === user.value?.address }) - selectedWallet.value = { address: primaryAccount?.address as string, walletProvider: primaryAccount?.walletProvider as ProviderString } - } - selectedOperatorID.value = "" - selectedPublicNodeURL.value = "" - selectedCollateral.value = "" - availableOperatorIDs.value = [] + if (selectedWallet.value.address === "") { + const primaryAccount = user.value?.accounts.find(item => { item.address === user.value?.address }) + selectedWallet.value = { address: primaryAccount?.address as string, walletProvider: primaryAccount?.walletProvider as ProviderString } + } + selectedOperatorID.value = "" + selectedPublicNodeURL.value = "" + selectedCollateral.value = "" + availableOperatorIDs.value = [] } const showSkeleton = ref(true) watch([loadingSessionLogin || loadingInitializeOperators], () => { - setTimeout(() => { - if (loadingSessionLogin || loadingInitializeOperators) { - showSkeleton.value = false - } - }, 500) + setTimeout(() => { + if (loadingSessionLogin || loadingInitializeOperators) { + showSkeleton.value = false + } + }, 500) }) diff --git a/apps/web/src/pages/overview/Overview.vue b/apps/web/src/pages/overview/Overview.vue index 438a6cf70..0946994d0 100644 --- a/apps/web/src/pages/overview/Overview.vue +++ b/apps/web/src/pages/overview/Overview.vue @@ -18,22 +18,22 @@ const { loadingInitializeOperators } = useOperators() const showSkeleton = ref(true) onMounted(() => { - setTimeout(() => { - if (loadingSessionLogin || loadingInitializeBreakdownMetrics || loadingInitializeAnalytics || loadingInitializeOperators) { - showSkeleton.value = false - } - }, 500) + setTimeout(() => { + if (loadingSessionLogin || loadingInitializeBreakdownMetrics || loadingInitializeAnalytics || loadingInitializeOperators) { + showSkeleton.value = false + } + }, 500) }) watch([loadingSessionLogin, - loadingInitializeBreakdownMetrics, - loadingInitializeAnalytics, - loadingInitializeOperators], () =>{ - setTimeout(() => { - if (loadingSessionLogin || loadingInitializeBreakdownMetrics || loadingInitializeAnalytics || loadingInitializeOperators) { - showSkeleton.value = false - } - }, 500) + loadingInitializeBreakdownMetrics, + loadingInitializeAnalytics, + loadingInitializeOperators], () =>{ + setTimeout(() => { + if (loadingSessionLogin || loadingInitializeBreakdownMetrics || loadingInitializeAnalytics || loadingInitializeOperators) { + showSkeleton.value = false + } + }, 500) }) diff --git a/apps/web/src/pages/overview/components/Announcements.vue b/apps/web/src/pages/overview/components/Announcements.vue index 92d03970d..2cb15825e 100644 --- a/apps/web/src/pages/overview/components/Announcements.vue +++ b/apps/web/src/pages/overview/components/Announcements.vue @@ -7,28 +7,28 @@ const openReadUpdate = ref(false) // eslint-disable-next-line no-undef const props = defineProps({ - viewId: { - type: String, - required: true, - } + viewId: { + type: String, + required: true, + } }) const handleOutsideClick = (event: any) => { - const announcement_container = document.getElementById(`${props.viewId}_announcement_container`) - const announcement_card = document.getElementById(`${props.viewId}_announcement_card`) - if (announcement_container && announcement_card) { - if (openReadUpdate.value && announcement_container.contains(event.target) && !announcement_card.contains(event.target)) { - openReadUpdate.value = false + const announcement_container = document.getElementById(`${props.viewId}_announcement_container`) + const announcement_card = document.getElementById(`${props.viewId}_announcement_card`) + if (announcement_container && announcement_card) { + if (openReadUpdate.value && announcement_container.contains(event.target) && !announcement_card.contains(event.target)) { + openReadUpdate.value = false + } } - } } onMounted(() => { - window.addEventListener("click", handleOutsideClick) + window.addEventListener("click", handleOutsideClick) }) onUnmounted(() =>{ - window.removeEventListener("click", handleOutsideClick) + window.removeEventListener("click", handleOutsideClick) }) diff --git a/apps/web/src/pages/overview/components/BreakdownChart.vue b/apps/web/src/pages/overview/components/BreakdownChart.vue index 805a64e1a..ada2fc782 100644 --- a/apps/web/src/pages/overview/components/BreakdownChart.vue +++ b/apps/web/src/pages/overview/components/BreakdownChart.vue @@ -9,11 +9,11 @@ import useBreakdownMetrics from "@/composables/breakdownMetrics" const { user } = useUser() const { - currentStaked, - stakingRewards, - totalWalletBalance, - initializeBreakdownMetricsComposable, - uninitializeBreakdownMetricsComposable + currentStaked, + stakingRewards, + totalWalletBalance, + initializeBreakdownMetricsComposable, + uninitializeBreakdownMetricsComposable } = useBreakdownMetrics() const { screenWidth } = useScreenDimensions() @@ -22,105 +22,105 @@ const selectedTimeframe = ref("historical") const chartData = ref({} as any) const getAccountColor = (address: string) => { - const walletProvider = user.value?.accounts.find( - item => item.address.toLocaleLowerCase() === address.toLocaleLowerCase() - )?.walletProvider as ProviderString + const walletProvider = user.value?.accounts.find( + item => item.address.toLocaleLowerCase() === address.toLocaleLowerCase() + )?.walletProvider as ProviderString - switch (walletProvider) { - case "MetaMask": - return "#F6851B" - case "CoinbaseWallet": - return "#3773F5" - case "WalletConnect": - return "#3396FF" - case "Trezor": - return "#00854D" - case "Ledger": - return "#D4A0FF" - case "IoPay": - return "#00D7C7" - case "TrustWallet": - return "#0B65C6" - default: - return "#80ABFF" - } + switch (walletProvider) { + case "MetaMask": + return "#F6851B" + case "CoinbaseWallet": + return "#3773F5" + case "WalletConnect": + return "#3396FF" + case "Trezor": + return "#00854D" + case "Ledger": + return "#D4A0FF" + case "IoPay": + return "#00D7C7" + case "TrustWallet": + return "#0B65C6" + default: + return "#80ABFF" + } } const formatLegendLabel = (address: string) => { - const account = user.value?.accounts.find(item => item.address.toLocaleLowerCase() === address.toLocaleLowerCase()) + const account = user.value?.accounts.find(item => item.address.toLocaleLowerCase() === address.toLocaleLowerCase()) - if (address.length <= 4) { - return address - } + if (address.length <= 4) { + return address + } - var start = address.substring(0, 3) - var end = address.substring(address.length - 3) - var middle = ".".repeat(2) + var start = address.substring(0, 3) + var end = address.substring(address.length - 3) + var middle = ".".repeat(2) - return (account? account.walletProvider : "Unknown") + " (" + start + middle + end + ")" + return (account? account.walletProvider : "Unknown") + " (" + start + middle + end + ")" } const setChartData = (userAnalytics: UserAnalyticsData) => { - let labels - let data: Array = [] - switch (selectedTimeframe.value) { - case "1 month": - labels = userAnalytics.oneMonth.labels - data = userAnalytics.oneMonth.data as any - break - case "6 months": - labels = userAnalytics.sixMonth.labels - data = userAnalytics.sixMonth.data as any - break - case "12 months": - labels = userAnalytics.oneYear.labels - data = userAnalytics.oneYear.data as any - break - case "historical": - labels = userAnalytics.historical.labels - data = userAnalytics.historical.data as any - break + let labels + let data: Array = [] + switch (selectedTimeframe.value) { + case "1 month": + labels = userAnalytics.oneMonth.labels + data = userAnalytics.oneMonth.data as any + break + case "6 months": + labels = userAnalytics.sixMonth.labels + data = userAnalytics.sixMonth.data as any + break + case "12 months": + labels = userAnalytics.oneYear.labels + data = userAnalytics.oneYear.data as any + break + case "historical": + labels = userAnalytics.historical.labels + data = userAnalytics.historical.data as any + break - default: - break - } + default: + break + } - chartData.value = { - labels : labels, - datasets : data.map((item: any) => { - const primaryAccount = item.walletAddress.toLocaleLowerCase() === user.value?.address.toLocaleLowerCase() - return { - data : item.walletBalance, - label : formatLegendLabel(item.walletAddress), - borderColor : getAccountColor(item.walletAddress), - fill: primaryAccount, - backgroundColor: primaryAccount? getAccountColor(item.walletAddress) : null, - pointRadius: 0, - tension: 0.1 - } - }) - } + chartData.value = { + labels : labels, + datasets : data.map((item: any) => { + const primaryAccount = item.walletAddress.toLocaleLowerCase() === user.value?.address.toLocaleLowerCase() + return { + data : item.walletBalance, + label : formatLegendLabel(item.walletAddress), + borderColor : getAccountColor(item.walletAddress), + fill: primaryAccount, + backgroundColor: primaryAccount? getAccountColor(item.walletAddress) : null, + pointRadius: 0, + tension: 0.1 + } + }) + } } const { userAnalytics, updateAnalytics, initializeAnalyticsComposable } = useAnalytics() watch(userAnalytics, () => { - setChartData(userAnalytics.value as UserAnalyticsData) + setChartData(userAnalytics.value as UserAnalyticsData) }) onMounted(() => { - setChartData(userAnalytics.value as UserAnalyticsData) + setChartData(userAnalytics.value as UserAnalyticsData) }) watch(selectedTimeframe, () => { - setChartData(userAnalytics.value as UserAnalyticsData) + setChartData(userAnalytics.value as UserAnalyticsData) }) watch(user, async () => { - await updateAnalytics() - setChartData(userAnalytics.value as UserAnalyticsData) + await updateAnalytics() + setChartData(userAnalytics.value as UserAnalyticsData) }) diff --git a/apps/web/src/pages/overview/components/BreakdownTable.vue b/apps/web/src/pages/overview/components/BreakdownTable.vue index 1ba8c1d83..af05c3167 100644 --- a/apps/web/src/pages/overview/components/BreakdownTable.vue +++ b/apps/web/src/pages/overview/components/BreakdownTable.vue @@ -21,114 +21,114 @@ const selectedOrientation = ref("ascending") const checkedItems = ref([] as any) const tableHeaderOptions = ref( - { - Wallets: { - headers: [ - // { - // title: '', - // value: 'blank_column' - // }, - { - title: "Wallet Provider", - value: "wallet_provider" + { + Wallets: { + headers: [ + // { + // title: '', + // value: 'blank_column' + // }, + { + title: "Wallet Provider", + value: "wallet_provider" + }, + { + title: "Account", + value: "act" + }, + { + title: "Wallet Balance", + value: "bal" + }, + { + title: "Stake Balance", + value: "stk_amt" + }, // Need to fetch based on wallet (FE SIDE) + { + title: "Stake Rewards (All-Time)", + value: "stk_rwd" + }, // Need to fetch based on wallet (FE SIDE) + ] }, - { - title: "Account", - value: "act" + Transactions: { + headers: [ + // { + // title: '', + // value: 'blank_column' + // }, + { + title: "Hash", + value: "tx_hash" + }, + { + title: "Type", + value: "tx_type" + }, + { + title: "Date", + value: "date" + }, + { + title: "Amount", + value: "stk_amt" + }, + { + title: "Price", + value: "price" + }, + { + title: "From", + value: "from" + }, + { + title: "To", + value: "to" + }, + ] }, - { - title: "Wallet Balance", - value: "bal" + Staking: { + headers: [ + // { + // title: '', + // value: 'blank_column' + // }, + { + title: "Date", + value: "date" + }, + { + title: "Wallet Address", + value: "wallet_address" + }, + { + title: "Type", + value: "type" + }, + { + title: "Amount", + value: "amount" + }, + { + title: "Fees", + value: "fees" + }, + { + title: "Status", + value: "status" + }, + { + title: "Hash", + value: "tx_hash" + }, + ] }, - { - title: "Stake Balance", - value: "stk_amt" - }, // Need to fetch based on wallet (FE SIDE) - { - title: "Stake Rewards (All-Time)", - value: "stk_rwd" - }, // Need to fetch based on wallet (FE SIDE) - ] - }, - Transactions: { - headers: [ - // { - // title: '', - // value: 'blank_column' - // }, - { - title: "Hash", - value: "tx_hash" - }, - { - title: "Type", - value: "tx_type" - }, - { - title: "Date", - value: "date" - }, - { - title: "Amount", - value: "stk_amt" - }, - { - title: "Price", - value: "price" - }, - { - title: "From", - value: "from" - }, - { - title: "To", - value: "to" - }, - ] - }, - Staking: { - headers: [ - // { - // title: '', - // value: 'blank_column' - // }, - { - title: "Date", - value: "date" - }, - { - title: "Wallet Address", - value: "wallet_address" - }, - { - title: "Type", - value: "type" - }, - { - title: "Amount", - value: "amount" - }, - { - title: "Fees", - value: "fees" - }, - { - title: "Status", - value: "status" - }, - { - title: "Hash", - value: "tx_hash" - }, - ] - }, - } + } ) const { user } = useUser() const tableData = ref({ - Wallets: [] as { + Wallets: [] as { tx_hash: string, wallet_provider: string, status: string, @@ -143,7 +143,7 @@ const tableData = ref({ tx_type: string, stk_rwd: string }[], - Transactions: [] as { + Transactions: [] as { tx_hash: string, wallet_provider: string, status: string, @@ -158,7 +158,7 @@ const tableData = ref({ tx_type: string, stk_rwd: string }[], - Staking: [] as { + Staking: [] as { tx_hash: string, wallet_provider: string, status: string, @@ -178,131 +178,131 @@ const tableData = ref({ const filteredData = ref(tableData.value[tableView.value as keyof typeof tableData.value]) const filterData = () => { - let filteredDataArray + let filteredDataArray - filteredDataArray = tableData.value[tableView.value as keyof typeof tableData.value] - if (searchInput.value === "") { filteredDataArray = tableData.value[tableView.value as keyof typeof tableData.value] - } else { - const searchTerm = searchInput.value.toLocaleLowerCase() - filteredDataArray = (tableData.value[tableView.value as keyof typeof tableData.value] as Array).filter(item => { - return true - // return ( - // Might need to modify to match types each variable - // {tx_hash: string, wallet_provider: string, status: string, - // staking_fees: string, type: string, amount: string, bal: string, - // act: string, date: string, blank_column: any, stk_amt: string, - // tx_type: string, stk_rwd: string } - // item.wallet_provider?.toString().toLocaleLowerCase().includes(searchTerm) || - // item.act?.toString().toLocaleLowerCase().includes(searchTerm) || - // item.bal?.toString().toLocaleLowerCase().includes(searchTerm) || - // item.stk_amt?.toString().toLocaleLowerCase().includes(searchTerm) || - // item.stk_rwd?.toString().toLocaleLowerCase().includes(searchTerm) || - // item.tx_hash?.toString().toLocaleLowerCase().includes(searchTerm) || - // item.date?.toString().toLocaleLowerCase().includes(searchTerm) || - // item.apy?.toString().toLocaleLowerCase().includes(searchTerm) || - // item.status?.toString().toLocaleLowerCase().includes(searchTerm) || - // item.type?.toString().toLocaleLowerCase().includes(searchTerm) || - // item.staking_fees?.toString().toLocaleLowerCase().includes(searchTerm) - // ) - }) - } - - if (selectedHeader.value !== "" && selectedOrientation.value !== "") { - filteredDataArray = filteredDataArray.sort((a, b) => { - const valA = a[selectedHeader.value] - const valB = b[selectedHeader.value] - - if (selectedOrientation.value === "ascending") { - return valA < valB ? -1 : valA > valB ? 1 : 0 - } else { - return valA > valB ? -1 : valA < valB ? 1 : 0 - } - }) - } - totalPages.value = Math.round(filteredDataArray.length / itemsPerPage.value) + if (searchInput.value === "") { + filteredDataArray = tableData.value[tableView.value as keyof typeof tableData.value] + } else { + const searchTerm = searchInput.value.toLocaleLowerCase() + filteredDataArray = (tableData.value[tableView.value as keyof typeof tableData.value] as Array).filter(item => { + return true + // return ( + // Might need to modify to match types each variable + // {tx_hash: string, wallet_provider: string, status: string, + // staking_fees: string, type: string, amount: string, bal: string, + // act: string, date: string, blank_column: any, stk_amt: string, + // tx_type: string, stk_rwd: string } + // item.wallet_provider?.toString().toLocaleLowerCase().includes(searchTerm) || + // item.act?.toString().toLocaleLowerCase().includes(searchTerm) || + // item.bal?.toString().toLocaleLowerCase().includes(searchTerm) || + // item.stk_amt?.toString().toLocaleLowerCase().includes(searchTerm) || + // item.stk_rwd?.toString().toLocaleLowerCase().includes(searchTerm) || + // item.tx_hash?.toString().toLocaleLowerCase().includes(searchTerm) || + // item.date?.toString().toLocaleLowerCase().includes(searchTerm) || + // item.apy?.toString().toLocaleLowerCase().includes(searchTerm) || + // item.status?.toString().toLocaleLowerCase().includes(searchTerm) || + // item.type?.toString().toLocaleLowerCase().includes(searchTerm) || + // item.staking_fees?.toString().toLocaleLowerCase().includes(searchTerm) + // ) + }) + } + + if (selectedHeader.value !== "" && selectedOrientation.value !== "") { + filteredDataArray = filteredDataArray.sort((a, b) => { + const valA = a[selectedHeader.value] + const valB = b[selectedHeader.value] + + if (selectedOrientation.value === "ascending") { + return valA < valB ? -1 : valA > valB ? 1 : 0 + } else { + return valA > valB ? -1 : valA < valB ? 1 : 0 + } + }) + } + totalPages.value = Math.round(filteredDataArray.length / itemsPerPage.value) - const start = (currentPage.value - 1) * itemsPerPage.value - const end = start + itemsPerPage.value - filteredData.value = filteredDataArray.slice(start, end) as any + const start = (currentPage.value - 1) * itemsPerPage.value + const end = start + itemsPerPage.value + filteredData.value = filteredDataArray.slice(start, end) as any } watch([searchInput, - tableView, - selectedHeader, - selectedOrientation, - currentPage], () => { - filterData() + tableView, + selectedHeader, + selectedOrientation, + currentPage], () => { + filterData() }) const convertJsonToCsv = (jsonData: any[]) => { - const separator = "," - const csvRows = [] + const separator = "," + const csvRows = [] - if (!Array.isArray(jsonData)) { - return "" - } + if (!Array.isArray(jsonData)) { + return "" + } - if (jsonData.length === 0) { - return "" - } + if (jsonData.length === 0) { + return "" + } - const keys = Object.keys(jsonData[0]) + const keys = Object.keys(jsonData[0]) - // Add headers - csvRows.push(keys.join(separator)) + // Add headers + csvRows.push(keys.join(separator)) - // Convert JSON data to CSV rows - jsonData.forEach(obj => { - const values = keys.map(key => obj[key]) - csvRows.push(values.join(separator)) - }) + // Convert JSON data to CSV rows + jsonData.forEach(obj => { + const values = keys.map(key => obj[key]) + csvRows.push(values.join(separator)) + }) - return csvRows.join("\n") + return csvRows.join("\n") } const convertJsonToExcelBuffer = (jsonData: unknown[]) => { - const worksheet = XLSX.utils.json_to_sheet(jsonData) - const workbook = XLSX.utils.book_new() - XLSX.utils.book_append_sheet(workbook, worksheet, "Sheet1") - const excelBuffer = XLSX.write(workbook, { type: "array", bookType: "xlsx" }) + const worksheet = XLSX.utils.json_to_sheet(jsonData) + const workbook = XLSX.utils.book_new() + XLSX.utils.book_append_sheet(workbook, worksheet, "Sheet1") + const excelBuffer = XLSX.write(workbook, { type: "array", bookType: "xlsx" }) - return excelBuffer + return excelBuffer } const downloadFile = (content: any, filename: string, mimeType: any) => { - const blob = new Blob([content], { type: mimeType }) - const url = URL.createObjectURL(blob) - const link = document.createElement("a") - link.href = url - link.download = filename - link.click() - - // Cleanup - URL.revokeObjectURL(url) + const blob = new Blob([content], { type: mimeType }) + const url = URL.createObjectURL(blob) + const link = document.createElement("a") + link.href = url + link.download = filename + link.click() + + // Cleanup + URL.revokeObjectURL(url) } const exportFile = () => { - const jsonData = checkedItems.value.length > 0 ? checkedItems.value : filteredData.value + const jsonData = checkedItems.value.length > 0 ? checkedItems.value : filteredData.value - const isMac = navigator.userAgent.indexOf("Mac") !== -1 - const fileExtension = isMac ? "csv" : "xlsx" + const isMac = navigator.userAgent.indexOf("Mac") !== -1 + const fileExtension = isMac ? "csv" : "xlsx" - if (fileExtension === "csv") { - const csvContent = convertJsonToCsv(jsonData) - downloadFile(csvContent, `${tableView.value}.csv`, "text/csv") - } else { - const excelBuffer = convertJsonToExcelBuffer(jsonData) - downloadFile(excelBuffer, `${tableView.value}.xlsx`, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") - } + if (fileExtension === "csv") { + const csvContent = convertJsonToCsv(jsonData) + downloadFile(csvContent, `${tableView.value}.csv`, "text/csv") + } else { + const excelBuffer = convertJsonToExcelBuffer(jsonData) + downloadFile(excelBuffer, `${tableView.value}.xlsx`, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") + } } const removeItemFromCheckedList = (item: any) => { - const index = checkedItems.value.indexOf(item) - if (index > -1) { - checkedItems.value.splice(index, 1) - } + const index = checkedItems.value.indexOf(item) + if (index > -1) { + checkedItems.value.splice(index, 1) + } } const { rawUserAnalytics } = useAnalytics() @@ -310,84 +310,84 @@ const { rawUserAnalytics } = useAnalytics() const setTableData = () => { - if (!rawUserAnalytics.value) return + if (!rawUserAnalytics.value) return - const sortedTransactions = rawUserAnalytics.value.sort((a: any, b: any) => { - new Date(a.receivedAt).getTime() - new Date(b.receivedAt).getTime() - }) + const sortedTransactions = rawUserAnalytics.value.sort((a: any, b: any) => { + new Date(a.receivedAt).getTime() - new Date(b.receivedAt).getTime() + }) - const newTable = tableData.value + const newTable = tableData.value - newTable.Transactions = sortedTransactions.map((item: any) => { - return { - tx_hash: item.txId, - stk_amt: item.amount, - tx_type: item.txDirection, - date: item.receivedAt, - status: item.status, - } - }) - - let filteredWallets = [] as any - let filteredStakingTransactions = [] as any - sortedTransactions.forEach((item: any) => { - const index = filteredWallets.findIndex((i: any) => i.act === item.walletAddress) + newTable.Transactions = sortedTransactions.map((item: any) => { + return { + tx_hash: item.txId, + stk_amt: item.amount, + tx_type: item.txDirection, + date: item.receivedAt, + status: item.status, + } + }) - if (index > -1) { - if (new Date(filteredWallets[index].date).getTime() < new Date(item.receivedAt).getTime()) { - filteredWallets[index].bal === item.walletBalance - } - } else { - let provider = user.value?.accounts.find(i => i.address.toLocaleLowerCase() === item.walletAddress.toLocaleLowerCase())?.walletProvider - filteredWallets.push( - { - wallet_provider: provider ? provider : "Unknown", - act: item.walletAddress, - bal: item.walletBalance, - stk_amt: item.amount, - stk_rwd: item.rewards, // TODO: @Chris we need all-time staking rewards fetched here based on wallet + let filteredWallets = [] as any + let filteredStakingTransactions = [] as any + sortedTransactions.forEach((item: any) => { + const index = filteredWallets.findIndex((i: any) => i.act === item.walletAddress) + + if (index > -1) { + if (new Date(filteredWallets[index].date).getTime() < new Date(item.receivedAt).getTime()) { + filteredWallets[index].bal === item.walletBalance + } + } else { + let provider = user.value?.accounts.find(i => i.address.toLocaleLowerCase() === item.walletAddress.toLocaleLowerCase())?.walletProvider + filteredWallets.push( + { + wallet_provider: provider ? provider : "Unknown", + act: item.walletAddress, + bal: item.walletBalance, + stk_amt: item.amount, + stk_rwd: item.rewards, // TODO: @Chris we need all-time staking rewards fetched here based on wallet + } + ) } - ) - } - if (item.type) { - filteredStakingTransactions.push({ - date: item.receivedAt, - act: item.walletAddress, - type: item.type, - amount: item.amount, - staking_fees: item.stakeFee, - status: item.status, - tx_hash: item.txId - }) - } - }) + if (item.type) { + filteredStakingTransactions.push({ + date: item.receivedAt, + act: item.walletAddress, + type: item.type, + amount: item.amount, + staking_fees: item.stakeFee, + status: item.status, + tx_hash: item.txId + }) + } + }) - newTable.Wallets = filteredWallets - newTable.Staking = filteredStakingTransactions - tableData.value = newTable + newTable.Wallets = filteredWallets + newTable.Staking = filteredStakingTransactions + tableData.value = newTable } const checkAll = ref(false) watch(checkAll, () => { - filteredData.value.map(item => { - if (checkAll.value && !checkedItems.value.includes(item)) { - checkedItems.value.push(item) - } else if (!checkAll && checkedItems.value.includes(item)) { - removeItemFromCheckedList(item) - } - }) + filteredData.value.map(item => { + if (checkAll.value && !checkedItems.value.includes(item)) { + checkedItems.value.push(item) + } else if (!checkAll && checkedItems.value.includes(item)) { + removeItemFromCheckedList(item) + } + }) }) watch(rawUserAnalytics, () => { - setTableData() - filterData() + setTableData() + filterData() }) onMounted(() => { - setTableData() - filterData() + setTableData() + filterData() }) diff --git a/apps/web/src/pages/overview/components/Staking.vue b/apps/web/src/pages/overview/components/Staking.vue index 492d913fb..4200640d2 100644 --- a/apps/web/src/pages/overview/components/Staking.vue +++ b/apps/web/src/pages/overview/components/Staking.vue @@ -52,17 +52,17 @@ const toggleBackgroundColor = ref("#eee") // Initial color const balances = ref<{ [key: string]: string | null }>({}) const fetchBalances = async () => { - const balancePromises = formattedWalletOptions.value.map(async (walletOption) => { - for (const address of walletOption.addresses) { - balances.value[address] = formatNumber(await getEthersBalance(address)) - } - }) + const balancePromises = formattedWalletOptions.value.map(async (walletOption) => { + for (const address of walletOption.addresses) { + balances.value[address] = formatNumber(await getEthersBalance(address)) + } + }) - await Promise.all(balancePromises) + await Promise.all(balancePromises) } watch(formattedWalletOptions, async () => { - await fetchBalances() + await fetchBalances() }) // const walletOptionsWithBalances = computed(() => { @@ -76,285 +76,285 @@ watch(formattedWalletOptions, async () => { // }) const toggleShineEffect = () => { - eigenIsToggled.value = !eigenIsToggled.value - isShining.value = eigenIsToggled.value - // toggleEstimatedAPY() + eigenIsToggled.value = !eigenIsToggled.value + isShining.value = eigenIsToggled.value + // toggleEstimatedAPY() - // Change the color based on the toggle state - toggleBackgroundColor.value = eigenIsToggled.value ? "green" : "#eee" + // Change the color based on the toggle state + toggleBackgroundColor.value = eigenIsToggled.value ? "green" : "#eee" - // Update stakeType - stakeType.value = eigenIsToggled.value ? "eigen" : "default" + // Update stakeType + stakeType.value = eigenIsToggled.value ? "eigen" : "default" } function toggleEstimatedAPY() { - if (estimatedAPY.value === "5.50") { - estimatedAPY.value = "10.00" - } else { - estimatedAPY.value = "5.50" - } + if (estimatedAPY.value === "5.50") { + estimatedAPY.value = "10.00" + } else { + estimatedAPY.value = "5.50" + } } const handleInputOnAmountToStakeOrWithdraw = (event: any) => { - const value = event.target.value.replace(/[^\d.]/g, "") - const parts = value.split(".") - parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",") + const value = event.target.value.replace(/[^\d.]/g, "") + const parts = value.split(".") + parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",") - // Limit to 18 decimal places - if (parts[1] && parts[1].length > 18) { - parts[1] = parts[1].slice(0, 18) - } + // Limit to 18 decimal places + if (parts[1] && parts[1].length > 18) { + parts[1] = parts[1].slice(0, 18) + } - // Update the model value - formattedAmountToStakeOrWithdraw.value = parts.join(".") + // Update the model value + formattedAmountToStakeOrWithdraw.value = parts.join(".") } const selectAmountInput = () => { - const inputElement = document.getElementById("amount_input") as HTMLInputElement + const inputElement = document.getElementById("amount_input") as HTMLInputElement - if (inputElement) { + if (inputElement) { - inputElement.setSelectionRange(0, inputElement.value.length) + inputElement.setSelectionRange(0, inputElement.value.length) - // For mobile devices - inputElement.select() - } + // For mobile devices + inputElement.select() + } } const aggregateAddressesByProvider = () => { - formattedWalletOptions.value = [] - // Iterate over user.value.accounts and aggregate addresses by provider - if (user.value) { - const accounts = user.value.accounts - const providers = accounts.map((account) => account.walletProvider) - const uniqueProviders = [...new Set(providers)] as Array - uniqueProviders.forEach((provider) => { - const addresses = accounts.filter((account) => account.walletProvider === provider).map((account) => account.address) - formattedWalletOptions.value.push({ - provider, - addresses - }) - }) - } else { + formattedWalletOptions.value = [] + // Iterate over user.value.accounts and aggregate addresses by provider + if (user.value) { + const accounts = user.value.accounts + const providers = accounts.map((account) => account.walletProvider) + const uniqueProviders = [...new Set(providers)] as Array + uniqueProviders.forEach((provider) => { + const addresses = accounts.filter((account) => account.walletProvider === provider).map((account) => account.address) + formattedWalletOptions.value.push({ + provider, + addresses + }) + }) + } else { // empty out staking comp - selectedStakingProvider.value = "" - selectedWalletAddress.value = null - formattedAmountToStakeOrWithdraw.value = "" - addressBalance.value = null - currentUserStake.value = 0 - } + selectedStakingProvider.value = "" + selectedWalletAddress.value = null + formattedAmountToStakeOrWithdraw.value = "" + addressBalance.value = null + currentUserStake.value = 0 + } } watch(formattedAmountToStakeOrWithdraw, async () => { - if (formattedAmountToStakeOrWithdraw.value) { - const floatAmount = parseFloat(formattedAmountToStakeOrWithdraw.value?.replace(/,/g, "")) - let maxAmount - if (selectedWalletAddress.value) { - maxAmount = await getEthersBalance(selectedWalletAddress.value) - } else { - maxAmount = 0 - } - - if (floatAmount > maxAmount) { - errorMessage.value = "Insufficient Funds" + if (formattedAmountToStakeOrWithdraw.value) { + const floatAmount = parseFloat(formattedAmountToStakeOrWithdraw.value?.replace(/,/g, "")) + let maxAmount + if (selectedWalletAddress.value) { + maxAmount = await getEthersBalance(selectedWalletAddress.value) + } else { + maxAmount = 0 + } + + if (floatAmount > maxAmount) { + errorMessage.value = "Insufficient Funds" + } else { + errorMessage.value = null + } } else { - errorMessage.value = null + errorMessage.value = null } - } else { - errorMessage.value = null - } }) watch(selectedWalletAddress, async () => { - if (!stakingComposableInitialized.value) return - if (selectedWalletAddress.value) { - addressBalance.value = (Math.round(await getEthersBalance(selectedWalletAddress.value) * 100) / 100) + " ETH" - isShining.value = true + if (!stakingComposableInitialized.value) return + if (selectedWalletAddress.value) { + addressBalance.value = (Math.round(await getEthersBalance(selectedWalletAddress.value) * 100) / 100) + " ETH" + isShining.value = true // currentUserStake.value = await getUserStake(selectedWalletAddress.value) - } else { - addressBalance.value = null + } else { + addressBalance.value = null // currentUserStake.value = 0 - } + } }) watch(user, async () => { - if (!stakingComposableInitialized.value) return - if (user.value?.id) { - aggregateAddressesByProvider() - termsOfServiceCheckbox.value = user.value?.agreedToTermsOfService as boolean - addressBalance.value = (Math.round(await getEthersBalance(user.value?.address as string) * 100) / 100) + " ETH" - selectedWalletAddress.value = user.value?.address as string - selectedStakingProvider.value = user.value?.walletProvider as ProviderString + if (!stakingComposableInitialized.value) return + if (user.value?.id) { + aggregateAddressesByProvider() + termsOfServiceCheckbox.value = user.value?.agreedToTermsOfService as boolean + addressBalance.value = (Math.round(await getEthersBalance(user.value?.address as string) * 100) / 100) + " ETH" + selectedWalletAddress.value = user.value?.address as string + selectedStakingProvider.value = user.value?.walletProvider as ProviderString // currentUserStake.value = await getUserStake(selectedWalletAddress.value as string) // estimatedFees.value = await getDepositFees() - } else { - selectedStakingProvider.value = "" - selectedWalletAddress.value = null - formattedAmountToStakeOrWithdraw.value = "" - addressBalance.value = null + } else { + selectedStakingProvider.value = "" + selectedWalletAddress.value = null + formattedAmountToStakeOrWithdraw.value = "" + addressBalance.value = null // currentUserStake.value = 0 - } + } }) onMounted(async () => { - // TODO: @ccali11 - Want to make sure this is non-blocking - await initializeStakingComposable() - aggregateAddressesByProvider() - currentEthPrice.value = Math.round((await getCurrentPrice({ coin: "ETH", currency: "USD" })) * 100) / 100 - if (user.value?.id) { + // TODO: @ccali11 - Want to make sure this is non-blocking + await initializeStakingComposable() + aggregateAddressesByProvider() + currentEthPrice.value = Math.round((await getCurrentPrice({ coin: "ETH", currency: "USD" })) * 100) / 100 + if (user.value?.id) { // estimatedFees.value = await getDepositFees() - addressBalance.value = (Math.round(await getEthersBalance(user.value?.address as string) * 100) / 100) + " ETH" - selectedStakingProvider.value = user.value?.walletProvider as ProviderString - selectedWalletAddress.value = user.value?.address as string - if (!stakingComposableInitialized.value) return - // currentUserStake.value = await getUserStake(selectedWalletAddress.value as string) - isShining.value = true - } - await fetchBalances() + addressBalance.value = (Math.round(await getEthersBalance(user.value?.address as string) * 100) / 100) + " ETH" + selectedStakingProvider.value = user.value?.walletProvider as ProviderString + selectedWalletAddress.value = user.value?.address as string + if (!stakingComposableInitialized.value) return + // currentUserStake.value = await getUserStake(selectedWalletAddress.value as string) + isShining.value = true + } + await fetchBalances() }) const handleOutsideClickForWalletInput = (event: any) => { - const selectWalletInputContainer = document.getElementById("selectWalletInputContainer") - const selectWalletInputButton = document.getElementById("selectWalletInputButton") + const selectWalletInputContainer = document.getElementById("selectWalletInputContainer") + const selectWalletInputButton = document.getElementById("selectWalletInputButton") - if (!selectWalletInputContainer?.contains(event.target) && !selectWalletInputButton?.contains(event.target)) { - openSelectWalletInput.value = false - } + if (!selectWalletInputContainer?.contains(event.target) && !selectWalletInputButton?.contains(event.target)) { + openSelectWalletInput.value = false + } } const handleOutsideClickForOperatorGroupInput = (event: any) => { - const selectOperatorGroupInputContainer = document.getElementById("selectOperatorGroupInputContainer") - const selectOperatorGroupInputButton = document.getElementById("selectOperatorGroupInputButton") + const selectOperatorGroupInputContainer = document.getElementById("selectOperatorGroupInputContainer") + const selectOperatorGroupInputButton = document.getElementById("selectOperatorGroupInputButton") - if (!selectOperatorGroupInputContainer?.contains(event.target) && !selectOperatorGroupInputButton?.contains(event.target)) { - openSelectOperatorGroupInput.value = false - } + if (!selectOperatorGroupInputContainer?.contains(event.target) && !selectOperatorGroupInputButton?.contains(event.target)) { + openSelectOperatorGroupInput.value = false + } } const handleOutsideClickForTermsOfService = (event: any) => { - const termsOfServiceContainer = document.getElementById("termsOfServiceContainer") - const termsOfServiceButton = document.getElementById("termsOfServiceButton") + const termsOfServiceContainer = document.getElementById("termsOfServiceContainer") + const termsOfServiceButton = document.getElementById("termsOfServiceButton") - if (!termsOfServiceContainer?.contains(event.target) && !termsOfServiceButton?.contains(event.target)) { - openTermsOfService.value = false - } + if (!termsOfServiceContainer?.contains(event.target) && !termsOfServiceButton?.contains(event.target)) { + openTermsOfService.value = false + } } watch(openSelectWalletInput, ()=>{ - if (openSelectWalletInput.value) { - window.addEventListener("click", handleOutsideClickForWalletInput) - } else { - window.removeEventListener("click", handleOutsideClickForWalletInput) - } + if (openSelectWalletInput.value) { + window.addEventListener("click", handleOutsideClickForWalletInput) + } else { + window.removeEventListener("click", handleOutsideClickForWalletInput) + } }) watch(openSelectOperatorGroupInput, ()=>{ - if (openSelectWalletInput.value) { - window.addEventListener("click", handleOutsideClickForOperatorGroupInput) - } else { - window.removeEventListener("click", handleOutsideClickForOperatorGroupInput) - } + if (openSelectWalletInput.value) { + window.addEventListener("click", handleOutsideClickForOperatorGroupInput) + } else { + window.removeEventListener("click", handleOutsideClickForOperatorGroupInput) + } }) watch(openTermsOfService, ()=>{ - if (openTermsOfService.value) { - window.addEventListener("click", handleOutsideClickForTermsOfService) - } else { - window.removeEventListener("click", handleOutsideClickForTermsOfService) - } + if (openTermsOfService.value) { + window.addEventListener("click", handleOutsideClickForTermsOfService) + } else { + window.removeEventListener("click", handleOutsideClickForTermsOfService) + } }) const handleStake = async () => { - stakeButtonText.value = "Staking..." - - // const activeAddress = await detectActiveWalletAddress(selectedStakingProvider.value) - // if (activeAddress !== selectedWalletAddress.value) { - // formattedAmountToStakeOrWithdraw.value = '' - // return alert(`The account you selected is not the same as the one that is active in your ${selectedStakingProvider.value} wallet. Please open your browser extension and select the account that you want to log in with.`) - // } - const result = await deposit({ - amount: formattedAmountToStakeOrWithdraw.value, - walletProvider: selectedStakingProvider.value, - type: stakeType.value - }) - - if (result === false) stakeButtonText.value = "User Rejected Signature" - else stakeButtonText.value = "Staked!" - - setTimeout(() =>{ - stakeButtonText.value = "Stake" - formattedAmountToStakeOrWithdraw.value = "" - }, 1000) - - if (result) { - const waitResponse = await result.wait(1) - eigenIsToggled.value = false - addressBalance.value = (Math.round(await getEthersBalance(user.value?.address as string) * 100) / 100) + " ETH" - if (waitResponse) { - alert("Your Stake Has Been Deposited!") - } else { - alert("Your Stake Action Has Failed, Please Try Again Later!") + stakeButtonText.value = "Staking..." + + // const activeAddress = await detectActiveWalletAddress(selectedStakingProvider.value) + // if (activeAddress !== selectedWalletAddress.value) { + // formattedAmountToStakeOrWithdraw.value = '' + // return alert(`The account you selected is not the same as the one that is active in your ${selectedStakingProvider.value} wallet. Please open your browser extension and select the account that you want to log in with.`) + // } + const result = await deposit({ + amount: formattedAmountToStakeOrWithdraw.value, + walletProvider: selectedStakingProvider.value, + type: stakeType.value + }) + + if (result === false) stakeButtonText.value = "User Rejected Signature" + else stakeButtonText.value = "Staked!" + + setTimeout(() =>{ + stakeButtonText.value = "Stake" + formattedAmountToStakeOrWithdraw.value = "" + }, 1000) + + if (result) { + const waitResponse = await result.wait(1) + eigenIsToggled.value = false + addressBalance.value = (Math.round(await getEthersBalance(user.value?.address as string) * 100) / 100) + " ETH" + if (waitResponse) { + alert("Your Stake Has Been Deposited!") + } else { + alert("Your Stake Action Has Failed, Please Try Again Later!") + } + console.log("waitResponse :>> ", waitResponse) } - console.log("waitResponse :>> ", waitResponse) - } - // currentUserStake.value = await getUserStake(selectedWalletAddress.value as string) + // currentUserStake.value = await getUserStake(selectedWalletAddress.value as string) } const handleWithdraw = async () => { - stakeButtonText.value = "Withdrawing..." - selectedOperatorGroup.value = null - // const activeAddress = await detectActiveWalletAddress(selectedStakingProvider.value) - // if (activeAddress !== selectedWalletAddress.value) { - // formattedAmountToStakeOrWithdraw.value = '' - // return alert(`The account you selected is not the same as the one that is active in your ${selectedStakingProvider.value} wallet. Please open your browser extension and select the account that you want to log in with.`) - // } - - const withdrawableBalance = await getWithdrawableBalance({ - walletProvider: selectedStakingProvider.value, - type: stakeType.value - }) + stakeButtonText.value = "Withdrawing..." + selectedOperatorGroup.value = null + // const activeAddress = await detectActiveWalletAddress(selectedStakingProvider.value) + // if (activeAddress !== selectedWalletAddress.value) { + // formattedAmountToStakeOrWithdraw.value = '' + // return alert(`The account you selected is not the same as the one that is active in your ${selectedStakingProvider.value} wallet. Please open your browser extension and select the account that you want to log in with.`) + // } + + const withdrawableBalance = await getWithdrawableBalance({ + walletProvider: selectedStakingProvider.value, + type: stakeType.value + }) - if (parseFloat(withdrawableBalance) < parseFloat(formattedAmountToStakeOrWithdraw.value)) { - stakeButtonText.value = "Withdraw" - formattedAmountToStakeOrWithdraw.value = "" - return alert(`You can currently withdraw up to ${withdrawableBalance} ETH. Please try again with a smaller amount.`) - } - - const result = await withdraw({ - amount: formattedAmountToStakeOrWithdraw.value, - walletProvider: selectedStakingProvider.value, - type: stakeType.value - }) + if (parseFloat(withdrawableBalance) < parseFloat(formattedAmountToStakeOrWithdraw.value)) { + stakeButtonText.value = "Withdraw" + formattedAmountToStakeOrWithdraw.value = "" + return alert(`You can currently withdraw up to ${withdrawableBalance} ETH. Please try again with a smaller amount.`) + } - if (!result) stakeButtonText.value = "Failed!" - else stakeButtonText.value = "Withdrawn!" + const result = await withdraw({ + amount: formattedAmountToStakeOrWithdraw.value, + walletProvider: selectedStakingProvider.value, + type: stakeType.value + }) - setTimeout(() =>{ - stakeButtonText.value = "Withdraw" - formattedAmountToStakeOrWithdraw.value = "" - }, 1000) - - if (result) { - const waitResponse = await result.wait(1) - eigenIsToggled.value = false - addressBalance.value = (Math.round(await getEthersBalance(user.value?.address as string) * 100) / 100) + " ETH" - if (waitResponse) { - alert("Your Stake Has Been Withdrawn!") - } else { - alert("Your Stake Action Has Failed, Please Try Again Later!") + if (!result) stakeButtonText.value = "Failed!" + else stakeButtonText.value = "Withdrawn!" + + setTimeout(() =>{ + stakeButtonText.value = "Withdraw" + formattedAmountToStakeOrWithdraw.value = "" + }, 1000) + + if (result) { + const waitResponse = await result.wait(1) + eigenIsToggled.value = false + addressBalance.value = (Math.round(await getEthersBalance(user.value?.address as string) * 100) / 100) + " ETH" + if (waitResponse) { + alert("Your Stake Has Been Withdrawn!") + } else { + alert("Your Stake Action Has Failed, Please Try Again Later!") + } } - } - // currentUserStake.value = await getUserStake(selectedWalletAddress.value as string) + // currentUserStake.value = await getUserStake(selectedWalletAddress.value as string) } function setStakeOrWithdraw(option: "stake" | "withdraw") { - stakeOrWithdraw.value = option - formattedAmountToStakeOrWithdraw.value = "" - stakeButtonText.value = option === "stake" ? "Stake" : "Withdraw" + stakeOrWithdraw.value = option + formattedAmountToStakeOrWithdraw.value = "" + stakeButtonText.value = option === "stake" ? "Stake" : "Withdraw" } diff --git a/apps/web/src/pages/overview/components/StakingAvg.vue b/apps/web/src/pages/overview/components/StakingAvg.vue index 8223ad22f..68f392e01 100644 --- a/apps/web/src/pages/overview/components/StakingAvg.vue +++ b/apps/web/src/pages/overview/components/StakingAvg.vue @@ -7,44 +7,44 @@ const openTimeFrameOptions = ref(false) const selectedTimeframe = ref("Last Week") const timeframeOptions = ref( - [ - "Last Week", - "1 Month", - "6 Months", - "12 Months", - "Historical" - ] + [ + "Last Week", + "1 Month", + "6 Months", + "12 Months", + "Historical" + ] ) // eslint-disable-next-line no-undef const props = defineProps({ - viewId: { - type: String, - required: true, - } + viewId: { + type: String, + required: true, + } }) const handleOutsideClick = (event: any) => { - const staking_avg_timeframe_button = document.getElementById(`${props.viewId}_staking_avg_timeframe_button`) - const staking_avg_timeframe_options = document.getElementById(`${props.viewId}_staking_avg_timeframe_options`) - - if (staking_avg_timeframe_options && staking_avg_timeframe_button) { - if (openTimeFrameOptions.value) { - if (!staking_avg_timeframe_options.contains(event.target)) { - if (!staking_avg_timeframe_button.contains(event.target)) { - openTimeFrameOptions.value = false + const staking_avg_timeframe_button = document.getElementById(`${props.viewId}_staking_avg_timeframe_button`) + const staking_avg_timeframe_options = document.getElementById(`${props.viewId}_staking_avg_timeframe_options`) + + if (staking_avg_timeframe_options && staking_avg_timeframe_button) { + if (openTimeFrameOptions.value) { + if (!staking_avg_timeframe_options.contains(event.target)) { + if (!staking_avg_timeframe_button.contains(event.target)) { + openTimeFrameOptions.value = false + } + } } - } } - } } onMounted(() => { - window.addEventListener("click", handleOutsideClick) + window.addEventListener("click", handleOutsideClick) }) onUnmounted(() =>{ - window.removeEventListener("click", handleOutsideClick) + window.removeEventListener("click", handleOutsideClick) }) diff --git a/apps/web/src/sessions.config.ts b/apps/web/src/sessions.config.ts index 497a2660e..c7d05e548 100644 --- a/apps/web/src/sessions.config.ts +++ b/apps/web/src/sessions.config.ts @@ -4,10 +4,10 @@ import useEnvironment from "@/composables/environment" const { usersUrl } = useEnvironment() export const SuperTokensWebJSConfig = { - appInfo: { - apiDomain: usersUrl, - appName: "Casimir", + appInfo: { + apiDomain: usersUrl, + appName: "Casimir", // apiBasePath: '/', - }, - recipeList: [Session.init()], + }, + recipeList: [Session.init()], } \ No newline at end of file diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts index f4a6be976..a0bc8126f 100644 --- a/apps/web/vite.config.ts +++ b/apps/web/vite.config.ts @@ -6,29 +6,29 @@ import nodePolyfills from "rollup-plugin-polyfill-node" import nodeResolve from "@rollup/plugin-node-resolve" export default defineConfig({ - server: { port: 3001 }, - plugins: [ - vue(), - nodePolyfills(), - nodeResolve() - ], - define: { - "global": "globalThis" - }, - resolve: { - alias: { - "@": path.resolve(path.dirname(fileURLToPath(import.meta.url)), "src"), - "./runtimeConfig": "./runtimeConfig.browser" + server: { port: 3001 }, + plugins: [ + vue(), + nodePolyfills(), + nodeResolve() + ], + define: { + "global": "globalThis" }, - extensions: [ - ".js", - ".json", - ".jsx", - ".mjs", - ".ts", - ".tsx", - ".vue", - ] - }, - envPrefix: "PUBLIC_" + resolve: { + alias: { + "@": path.resolve(path.dirname(fileURLToPath(import.meta.url)), "src"), + "./runtimeConfig": "./runtimeConfig.browser" + }, + extensions: [ + ".js", + ".json", + ".jsx", + ".mjs", + ".ts", + ".tsx", + ".vue", + ] + }, + envPrefix: "PUBLIC_" }) \ No newline at end of file diff --git a/common/aws/src/index.ts b/common/aws/src/index.ts index 0e9f1721a..591441afd 100644 --- a/common/aws/src/index.ts +++ b/common/aws/src/index.ts @@ -7,18 +7,18 @@ import { SecretsManagerClient, GetSecretValueCommand } from "@aws-sdk/client-sec * @returns secret string */ export async function getSecret(id: string) { - const aws = new SecretsManagerClient({}) - const { SecretString } = await aws.send( - new GetSecretValueCommand( - { - SecretId: id - } + const aws = new SecretsManagerClient({}) + const { SecretString } = await aws.send( + new GetSecretValueCommand( + { + SecretId: id + } + ) ) - ) - if (!SecretString) { - throw new Error(`No secret found for ${id}`) - } - return SecretString + if (!SecretString) { + throw new Error(`No secret found for ${id}`) + } + return SecretString } /** @@ -28,13 +28,13 @@ export async function getSecret(id: string) { * @returns AWS credentials */ export async function loadCredentials() { - const defaultProfile = "consensus-networks-dev" - if (!process.env.AWS_ACCESS_KEY_ID || !process.env.AWS_SECRET_ACCESS_KEY) { - process.env.AWS_PROFILE = process.env.AWS_PROFILE || defaultProfile - return await fromIni()() - } - return { - accessKeyId: process.env.AWS_ACCESS_KEY_ID, - secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY - } + const defaultProfile = "consensus-networks-dev" + if (!process.env.AWS_ACCESS_KEY_ID || !process.env.AWS_SECRET_ACCESS_KEY) { + process.env.AWS_PROFILE = process.env.AWS_PROFILE || defaultProfile + return await fromIni()() + } + return { + accessKeyId: process.env.AWS_ACCESS_KEY_ID, + secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY + } } \ No newline at end of file diff --git a/common/data/src/index.ts b/common/data/src/index.ts index e897722bb..06322bdbe 100644 --- a/common/data/src/index.ts +++ b/common/data/src/index.ts @@ -10,15 +10,15 @@ import { JsonType, GlueType, PostgresType, Schema } from "./providers/schema" import { JsonSchema } from "./interfaces/JsonSchema" export { - accountSchema, - actionSchema, - eventSchema, - nonceSchema, - operatorSchema, - userAccountSchema, - userSchema, - Postgres, - Schema + accountSchema, + actionSchema, + eventSchema, + nonceSchema, + operatorSchema, + userAccountSchema, + userSchema, + Postgres, + Schema } export type { JsonSchema, JsonType, GlueType, PostgresType } \ No newline at end of file diff --git a/common/data/src/providers/schema.ts b/common/data/src/providers/schema.ts index e5a7d3cbd..83db4a2b8 100644 --- a/common/data/src/providers/schema.ts +++ b/common/data/src/providers/schema.ts @@ -7,10 +7,10 @@ export type GlueType = glue.Type export type PostgresType = "STRING" | "INTEGER" | "BOOLEAN" | "DOUBLE" | "DECIMAL" | "BIGINT" | "TIMESTAMP" | "JSON" | "DATE" export class Schema { - /** Input JSON schema object */ - private jsonSchema: JsonSchema + /** Input JSON schema object */ + private jsonSchema: JsonSchema - /** + /** * @param jsonSchema {JsonSchema} - Input JSON schema object * @example * ```typescript @@ -18,11 +18,11 @@ export class Schema { * const schema = new Schema(eventSchema) * ``` */ - constructor(jsonSchema: JsonSchema) { - this.jsonSchema = jsonSchema - } + constructor(jsonSchema: JsonSchema) { + this.jsonSchema = jsonSchema + } - /** + /** * Get an array of Glue columns from the JSON schema object. * @returns {glue.Column[]} Array of Glue columns * @@ -32,26 +32,26 @@ export class Schema { * const columns = schema.getGlueColumns() * ``` */ - getGlueColumns(): glue.Column[] { - return Object.keys(this.jsonSchema.properties).map((name: string) => { - const property = this.jsonSchema.properties[name] + getGlueColumns(): glue.Column[] { + return Object.keys(this.jsonSchema.properties).map((name: string) => { + const property = this.jsonSchema.properties[name] - // 'STRING' | 'INTEGER' | 'BOOLEAN' | 'DOUBLE' | 'DECIMAL' | 'BIG_INT' | 'TIMESTAMP' | 'JSON' | 'DATE' - const typeKey = property.type.toUpperCase() as keyof glue.Schema + // 'STRING' | 'INTEGER' | 'BOOLEAN' | 'DOUBLE' | 'DECIMAL' | 'BIG_INT' | 'TIMESTAMP' | 'JSON' | 'DATE' + const typeKey = property.type.toUpperCase() as keyof glue.Schema - let type: GlueType = glue.Schema[typeKey] + let type: GlueType = glue.Schema[typeKey] - if (name.endsWith("_at")) type = glue.Schema.TIMESTAMP - if (name.endsWith("_balance")) type = glue.Schema.BIG_INT - if (name == "amount") type = glue.Schema.BIG_INT - if (name === "price") type = glue.Schema.FLOAT + if (name.endsWith("_at")) type = glue.Schema.TIMESTAMP + if (name.endsWith("_balance")) type = glue.Schema.BIG_INT + if (name == "amount") type = glue.Schema.BIG_INT + if (name === "price") type = glue.Schema.FLOAT - const comment = property.description - return { name, type, comment } - }) - } + const comment = property.description + return { name, type, comment } + }) + } - /** + /** * Get a Postgres table from the JSON schema object. * @returns {string} Postgres table * @@ -61,50 +61,50 @@ export class Schema { * const table = schema.getPostgresTable() * ``` */ - getPostgresTable(): string { - const compositeKey = this.jsonSchema.composite_key - const uniqueFields = this.jsonSchema.uniqueFields || [] - const columns = Object.keys(this.jsonSchema.properties).map((name: string) => { - const property = this.jsonSchema.properties[name] - let type = { - string: "VARCHAR", - number: "DOUBLE", - integer: "INTEGER", - boolean: "BOOLEAN", - object: "JSON", - array: "JSON", - null: "VARCHAR", - serial: "SERIAL" - }[property.type as JsonType] as PostgresType - - if (name.endsWith("_at")) type = "TIMESTAMP" - if (name.includes("balance")) type = "BIGINT" - - let column = `${name} ${type}` - - const comment = property.description - if (comment.includes("PK")) column += " PRIMARY KEY" + getPostgresTable(): string { + const compositeKey = this.jsonSchema.composite_key + const uniqueFields = this.jsonSchema.uniqueFields || [] + const columns = Object.keys(this.jsonSchema.properties).map((name: string) => { + const property = this.jsonSchema.properties[name] + let type = { + string: "VARCHAR", + number: "DOUBLE", + integer: "INTEGER", + boolean: "BOOLEAN", + object: "JSON", + array: "JSON", + null: "VARCHAR", + serial: "SERIAL" + }[property.type as JsonType] as PostgresType + + if (name.endsWith("_at")) type = "TIMESTAMP" + if (name.includes("balance")) type = "BIGINT" + + let column = `${name} ${type}` + + const comment = property.description + if (comment.includes("PK")) column += " PRIMARY KEY" - const defaultValue = property.default - if (defaultValue !== undefined) column += ` DEFAULT ${defaultValue}` + const defaultValue = property.default + if (defaultValue !== undefined) column += ` DEFAULT ${defaultValue}` - return column - }) + return column + }) - /** Check for composite key property and add the primary key if so */ - if (compositeKey) columns.push(`PRIMARY KEY (${compositeKey})`) + /** Check for composite key property and add the primary key if so */ + if (compositeKey) columns.push(`PRIMARY KEY (${compositeKey})`) - /** Make table name plural of schema objects (todo: check edge-cases) */ - const tableName = this.getTitle() + /** Make table name plural of schema objects (todo: check edge-cases) */ + const tableName = this.getTitle() - const queryString = uniqueFields.length > 0 ? `CREATE TABLE ${tableName} (\n\t${columns.join(",\n\t")}, \n\tUNIQUE (${uniqueFields.join(", ")}));` : `CREATE TABLE ${tableName} (\n\t${columns.join(",\n\t")}\n);` - return queryString - } + const queryString = uniqueFields.length > 0 ? `CREATE TABLE ${tableName} (\n\t${columns.join(",\n\t")}, \n\tUNIQUE (${uniqueFields.join(", ")}));` : `CREATE TABLE ${tableName} (\n\t${columns.join(",\n\t")}\n);` + return queryString + } - /** + /** * Get the title of the JSON schema object. */ - getTitle(): string { - return snakeCase(this.jsonSchema.title) + "s" - } + getTitle(): string { + return snakeCase(this.jsonSchema.title) + "s" + } } \ No newline at end of file diff --git a/common/env/src/index.ts b/common/env/src/index.ts index c281577ea..75a3c1076 100644 --- a/common/env/src/index.ts +++ b/common/env/src/index.ts @@ -8,31 +8,31 @@ import MOCK_VALIDATORS from "./mock/validators.json" // Default CasimirViews contract deployed to 0x394042CBB8bF5444766496897982A5CDd01d5099 const ETHEREUM_CONTRACTS = { - TESTNET: { - BEACON_LIBRARY_ADDRESS: "0x0295bfe577d6833882Ee0E1Bccc4a5825d1Df653", - MANAGER_BEACON_ADDRESS: "0x69D830C11bbD81c0A9AC031d17A2599D3a0F632E", - POOL_BEACON_ADDRESS: "0x9Ef6fb4fe7F7EB9DDeB019028E978439b9aD72BF", - REGISTRY_BEACON_ADDRESS: "0xC0799f7643978828cEBCe4F327dcA233dE1871C8", - UPKEEP_BEACON_ADDRESS: "0x0CCA5B647598e86fc0518A462f2e61C58Dc6F5ac", - VIEWS_BEACON_ADDRESS: "0x7B07be561eA274a78D9dC30FCFAcEeb2C6Ac3962", - FACTORY_ADDRESS: "0xA6fd22c5633bCD82Ee25045de91351a8dfA2c76F", + TESTNET: { + BEACON_LIBRARY_ADDRESS: "0x0295bfe577d6833882Ee0E1Bccc4a5825d1Df653", + MANAGER_BEACON_ADDRESS: "0x69D830C11bbD81c0A9AC031d17A2599D3a0F632E", + POOL_BEACON_ADDRESS: "0x9Ef6fb4fe7F7EB9DDeB019028E978439b9aD72BF", + REGISTRY_BEACON_ADDRESS: "0xC0799f7643978828cEBCe4F327dcA233dE1871C8", + UPKEEP_BEACON_ADDRESS: "0x0CCA5B647598e86fc0518A462f2e61C58Dc6F5ac", + VIEWS_BEACON_ADDRESS: "0x7B07be561eA274a78D9dC30FCFAcEeb2C6Ac3962", + FACTORY_ADDRESS: "0xA6fd22c5633bCD82Ee25045de91351a8dfA2c76F", - FUNCTIONS_BILLING_REGISTRY_ADDRESS: "0x566087488869A18767cBA3Adb19dfc713FE56Ac6", - FUNCTIONS_ORACLE_ADDRESS: "0x914F29Ddb0b8A8201a58e6eeaf71d6df36429214", - FUNCTIONS_ORACLE_FACTORY_ADDRESS: "0x1304Dc23DD83f5c374193839E880cCa5D040f5A7", + FUNCTIONS_BILLING_REGISTRY_ADDRESS: "0x566087488869A18767cBA3Adb19dfc713FE56Ac6", + FUNCTIONS_ORACLE_ADDRESS: "0x914F29Ddb0b8A8201a58e6eeaf71d6df36429214", + FUNCTIONS_ORACLE_FACTORY_ADDRESS: "0x1304Dc23DD83f5c374193839E880cCa5D040f5A7", - DEPOSIT_CONTRACT_ADDRESS: "0xff50ed3d0ec03aC01D4C79aAd74928BFF48a7b2b", - KEEPER_REGISTRAR_ADDRESS: "0x57A4a13b35d25EE78e084168aBaC5ad360252467", - KEEPER_REGISTRY_ADDRESS: "0xE16Df59B887e3Caa439E0b29B42bA2e7976FD8b2", - LINK_ETH_FEED_ADDRESS: "0xb4c4a493AB6356497713A78FFA6c60FB53517c63", - LINK_TOKEN_ADDRESS: "0x326C977E6efc84E512bB9C30f76E30c160eD06FB", - SSV_NETWORK_ADDRESS: "0xC3CD9A0aE89Fff83b71b58b6512D43F8a41f363D", - SSV_TOKEN_ADDRESS: "0x3a9f01091C446bdE031E39ea8354647AFef091E7", - SSV_VIEWS_ADDRESS: "0xAE2C84c48272F5a1746150ef333D5E5B51F68763", - SWAP_FACTORY_ADDRESS: "0x1F98431c8aD98523631AE4a59f267346ea31F984", - SWAP_ROUTER_ADDRESS: "0xE592427A0AEce92De3Edee1F18E0157C05861564", - WETH_TOKEN_ADDRESS: "0xB4FBF271143F4FBf7B91A5ded31805e42b2208d6" - } + DEPOSIT_CONTRACT_ADDRESS: "0xff50ed3d0ec03aC01D4C79aAd74928BFF48a7b2b", + KEEPER_REGISTRAR_ADDRESS: "0x57A4a13b35d25EE78e084168aBaC5ad360252467", + KEEPER_REGISTRY_ADDRESS: "0xE16Df59B887e3Caa439E0b29B42bA2e7976FD8b2", + LINK_ETH_FEED_ADDRESS: "0xb4c4a493AB6356497713A78FFA6c60FB53517c63", + LINK_TOKEN_ADDRESS: "0x326C977E6efc84E512bB9C30f76E30c160eD06FB", + SSV_NETWORK_ADDRESS: "0xC3CD9A0aE89Fff83b71b58b6512D43F8a41f363D", + SSV_TOKEN_ADDRESS: "0x3a9f01091C446bdE031E39ea8354647AFef091E7", + SSV_VIEWS_ADDRESS: "0xAE2C84c48272F5a1746150ef333D5E5B51F68763", + SWAP_FACTORY_ADDRESS: "0x1F98431c8aD98523631AE4a59f267346ea31F984", + SWAP_ROUTER_ADDRESS: "0xE592427A0AEce92De3Edee1F18E0157C05861564", + WETH_TOKEN_ADDRESS: "0xB4FBF271143F4FBf7B91A5ded31805e42b2208d6" + } } enum ETHEREUM_NETWORK_NAME { @@ -44,11 +44,11 @@ enum ETHEREUM_RPC_URL { } const ETHEREUM_SIGNERS = { - TESTNET: { - DAO_ORACLE_ADDRESS: "0x728474D29c2F81eb17a669a7582A2C17f1042b57", - DON_TRANSMITTER_ADDRESS: "0x84725c8f954f18709aDcA150a0635D2fBE94fDfF", - OWNER_ADDRESS: "0xd557a5745d4560B24D36A68b52351ffF9c86A212" - } + TESTNET: { + DAO_ORACLE_ADDRESS: "0x728474D29c2F81eb17a669a7582A2C17f1042b57", + DON_TRANSMITTER_ADDRESS: "0x84725c8f954f18709aDcA150a0635D2fBE94fDfF", + OWNER_ADDRESS: "0xd557a5745d4560B24D36A68b52351ffF9c86A212" + } } enum HARDHAT_NETWORK_KEY { @@ -58,12 +58,12 @@ enum HARDHAT_NETWORK_KEY { } export { - ETHEREUM_CONTRACTS, - ETHEREUM_NETWORK_NAME, - ETHEREUM_RPC_URL, - ETHEREUM_SIGNERS, - HARDHAT_NETWORK_KEY, - MOCK_OPERATORS, - MOCK_RESHARES, - MOCK_VALIDATORS + ETHEREUM_CONTRACTS, + ETHEREUM_NETWORK_NAME, + ETHEREUM_RPC_URL, + ETHEREUM_SIGNERS, + HARDHAT_NETWORK_KEY, + MOCK_OPERATORS, + MOCK_RESHARES, + MOCK_VALIDATORS } diff --git a/common/events/src/index.ts b/common/events/src/index.ts index 50d5fe6a6..ebe7a31b3 100644 --- a/common/events/src/index.ts +++ b/common/events/src/index.ts @@ -10,52 +10,52 @@ export function getEventsIterable(input: { provider?: ethers.providers.JsonRpcProvider; startBlock?: number; }) { - const provider = input.provider || new ethers.providers.JsonRpcProvider(input.ethereumUrl) - return (async function* () { - const queue: ethers.Event[] = [] - const enqueueEvent = (...args: ethers.Event[]) => { - const e = args[args.length - 1] as ethers.Event - queue.push(e) - } - const latestBlock = await provider.getBlockNumber() - for (const filter of input.contractFilters) { - for (const address of filter.addresses) { - for (const event of filter.events) { - const contract = new ethers.Contract(address, filter.abi, provider) as ethers.Contract - const tempQueue: ethers.Event[] = [] - const tempListener = (...args: ethers.Event[]) => { + const provider = input.provider || new ethers.providers.JsonRpcProvider(input.ethereumUrl) + return (async function* () { + const queue: ethers.Event[] = [] + const enqueueEvent = (...args: ethers.Event[]) => { const e = args[args.length - 1] as ethers.Event - if (e.blockNumber > latestBlock) { - tempQueue.push(e) - } - } - contract.on(event, tempListener) - if (input.startBlock) { - const historicalEvents = await contract.queryFilter(event, input.startBlock, latestBlock) - for (const historicalEvent of historicalEvents) { - enqueueEvent(historicalEvent) - } - } - contract.off(event, tempListener) - while (tempQueue.length) { - const nextTempEvent = tempQueue.shift() - if (nextTempEvent) { - enqueueEvent(nextTempEvent) + queue.push(e) + } + const latestBlock = await provider.getBlockNumber() + for (const filter of input.contractFilters) { + for (const address of filter.addresses) { + for (const event of filter.events) { + const contract = new ethers.Contract(address, filter.abi, provider) as ethers.Contract + const tempQueue: ethers.Event[] = [] + const tempListener = (...args: ethers.Event[]) => { + const e = args[args.length - 1] as ethers.Event + if (e.blockNumber > latestBlock) { + tempQueue.push(e) + } + } + contract.on(event, tempListener) + if (input.startBlock) { + const historicalEvents = await contract.queryFilter(event, input.startBlock, latestBlock) + for (const historicalEvent of historicalEvents) { + enqueueEvent(historicalEvent) + } + } + contract.off(event, tempListener) + while (tempQueue.length) { + const nextTempEvent = tempQueue.shift() + if (nextTempEvent) { + enqueueEvent(nextTempEvent) + } + } + contract.on(event, enqueueEvent) + } } - } - contract.on(event, enqueueEvent) } - } - } - while (true) { - if (queue.length > 0) { - const nextEvent = queue.shift() - if (nextEvent) { - yield nextEvent + while (true) { + if (queue.length > 0) { + const nextEvent = queue.shift() + if (nextEvent) { + yield nextEvent + } + } else { + await new Promise((resolve) => setTimeout(resolve, 1000)) + } } - } else { - await new Promise((resolve) => setTimeout(resolve, 1000)) - } - } - })() + })() } diff --git a/common/fetch/src/index.ts b/common/fetch/src/index.ts index 778ff55ec..1ceb396a9 100644 --- a/common/fetch/src/index.ts +++ b/common/fetch/src/index.ts @@ -7,22 +7,24 @@ * @example * const response = await fetchRetry('https://example.com') */ -export async function fetchRetry(info: RequestInfo, init?: RequestInit, retriesLeft: number | undefined = 25): Promise { - if (retriesLeft === 0) { - throw new Error("API request failed after maximum retries") - } +export async function fetchRetry( + info: RequestInfo, init?: RequestInit, retriesLeft: number | undefined = 25 +): Promise { + if (retriesLeft === 0) { + throw new Error("API request failed after maximum retries") + } - try { - const response = await fetch(info, init) - if (response.status !== 200) { - await new Promise(resolve => setTimeout(resolve, 5000)) - console.log("Retrying fetch request to", info, init) - return await fetchRetry(info, init || {}, retriesLeft - 1) + try { + const response = await fetch(info, init) + if (response.status !== 200) { + await new Promise(resolve => setTimeout(resolve, 5000)) + console.log("Retrying fetch request to", info, init) + return await fetchRetry(info, init || {}, retriesLeft - 1) + } + return response + } catch (error) { + await new Promise(resolve => setTimeout(resolve, 5000)) + console.log("Retrying fetch request to", info, init) + return await fetchRetry(info, init || {}, retriesLeft - 1) } - return response - } catch (error) { - await new Promise(resolve => setTimeout(resolve, 5000)) - console.log("Retrying fetch request to", info, init) - return await fetchRetry(info, init || {}, retriesLeft - 1) - } } \ No newline at end of file diff --git a/common/format/src/index.ts b/common/format/src/index.ts index 39df86fbd..8bc7fa488 100644 --- a/common/format/src/index.ts +++ b/common/format/src/index.ts @@ -4,13 +4,13 @@ * @returns A camelCase string from the input string */ export function camelCase(string: string): string { - const words = string.split(/[\s_-]+/).map(word => { - return word.replace(/\w+/g, (word) => { - return word[0].toUpperCase() + word.slice(1).toLowerCase() + const words = string.split(/[\s_-]+/).map(word => { + return word.replace(/\w+/g, (word) => { + return word[0].toUpperCase() + word.slice(1).toLowerCase() + }) }) - }) - const result = words.join("") - return result[0].toLowerCase() + result.slice(1) + const result = words.join("") + return result[0].toLowerCase() + result.slice(1) } /** @@ -21,13 +21,13 @@ export function camelCase(string: string): string { * */ export function pascalCase(string: string): string { - const words = string.split(/[\s_-]+/).map(word => { - return word.replace(/\w+/g, (word) => { - return word[0].toUpperCase() + word.slice(1).toLowerCase() + const words = string.split(/[\s_-]+/).map(word => { + return word.replace(/\w+/g, (word) => { + return word[0].toUpperCase() + word.slice(1).toLowerCase() + }) }) - }) - const result = words.join("") - return result + const result = words.join("") + return result } /** @@ -36,10 +36,10 @@ export function pascalCase(string: string): string { * @returns A snake_case string from the input string */ export function snakeCase(string: string): string { - return string.replace(/\W+/g, " ") - .split(/ |\B(?=[A-Z])/) - .map(word => word.toLowerCase()) - .join("_") + return string.replace(/\W+/g, " ") + .split(/ |\B(?=[A-Z])/) + .map(word => word.toLowerCase()) + .join("_") } /** @@ -48,8 +48,8 @@ export function snakeCase(string: string): string { * @returns A kebab-case string from the input string */ export function kebabCase(string: string): string { - return string.replace(/\W+/g, " ") - .split(/ |\B(?=[A-Z])/) - .map(word => word.toLowerCase()) - .join("-") + return string.replace(/\W+/g, " ") + .split(/ |\B(?=[A-Z])/) + .map(word => word.toLowerCase()) + .join("-") } \ No newline at end of file diff --git a/common/logs/src/index.ts b/common/logs/src/index.ts index 763325d6c..1765d6f1a 100644 --- a/common/logs/src/index.ts +++ b/common/logs/src/index.ts @@ -1,19 +1,19 @@ import fs from "fs" export function getStartBlock(blockLogPath: string) { - if (fs.existsSync(blockLogPath)) { - return parseInt(fs.readFileSync(blockLogPath, "utf8")) - } + if (fs.existsSync(blockLogPath)) { + return parseInt(fs.readFileSync(blockLogPath, "utf8")) + } } export function updateStartBlock(blockLogPath: string, blockNumber: number) { - fs.writeFileSync(blockLogPath, blockNumber.toString()) + fs.writeFileSync(blockLogPath, blockNumber.toString()) } export function updateExecutionLog(executionLogPath: string, log: string) { - fs.appendFileSync(executionLogPath, `${log}\n`) + fs.appendFileSync(executionLogPath, `${log}\n`) } export function updateErrorLog(errorLogPath: string, log: string) { - fs.appendFileSync(errorLogPath, `${log}\n`) + fs.appendFileSync(errorLogPath, `${log}\n`) } \ No newline at end of file diff --git a/common/shell/src/index.ts b/common/shell/src/index.ts index ae1849aca..61fb785f8 100644 --- a/common/shell/src/index.ts +++ b/common/shell/src/index.ts @@ -6,21 +6,21 @@ import { exec, execSync } from "child_process" * @returns A promise that resolves when the command exits */ export async function run(command: string) { - const child = exec(command) - let data = "" - return new Promise((resolve, reject) => { - child.on("error", reject) - child.stdout?.on("data", chunk => { - process.stdout.write(chunk.toString()) - data += chunk.toString() + const child = exec(command) + let data = "" + return new Promise((resolve, reject) => { + child.on("error", reject) + child.stdout?.on("data", chunk => { + process.stdout.write(chunk.toString()) + data += chunk.toString() + }) + child.stderr?.on("data", chunk => { + process.stdout.write(chunk.toString()) + }) + child.on("exit", () => { + resolve(data) + }) }) - child.stderr?.on("data", chunk => { - process.stdout.write(chunk.toString()) - }) - child.on("exit", () => { - resolve(data) - }) - }) } /** @@ -30,16 +30,16 @@ export async function run(command: string) { * @returns A promise that resolves when the command exits */ export async function runRetry(command: string, retriesLeft: number | undefined = 25): Promise { - if (retriesLeft === 0) { - throw new Error("Command failed after maximum retries") - } - try { - return await run(command) - } catch (error) { - await new Promise(resolve => setTimeout(resolve, 5000)) - console.log("Retrying command", command) - return await runRetry(command, retriesLeft - 1) - } + if (retriesLeft === 0) { + throw new Error("Command failed after maximum retries") + } + try { + return await run(command) + } catch (error) { + await new Promise(resolve => setTimeout(resolve, 5000)) + console.log("Retrying command", command) + return await runRetry(command, retriesLeft - 1) + } } /** @@ -48,5 +48,5 @@ export async function runRetry(command: string, retriesLeft: number | undefined * @returns The output of the command */ export function runSync(command: string) { - return execSync(command).toString() + return execSync(command).toString() } \ No newline at end of file diff --git a/common/ssv/src/providers/scanner.ts b/common/ssv/src/providers/scanner.ts index b723d2e97..919102b53 100644 --- a/common/ssv/src/providers/scanner.ts +++ b/common/ssv/src/providers/scanner.ts @@ -9,145 +9,152 @@ import { Operator } from "../interfaces/Operator" import { ScannerOptions } from "../interfaces/ScannerOptions" export class Scanner { - DAY = 5400 - WEEK = this.DAY * 7 - MONTH = this.DAY * 30 - provider: ethers.providers.JsonRpcProvider - ssvClusters: ISSVClusters & ethers.Contract - ssvOperators: ISSVOperators & ethers.Contract - ssvViews: ISSVViews & ethers.Contract + DAY = 5400 + WEEK = this.DAY * 7 + MONTH = this.DAY * 30 + provider: ethers.providers.JsonRpcProvider + ssvClusters: ISSVClusters & ethers.Contract + ssvOperators: ISSVOperators & ethers.Contract + ssvViews: ISSVViews & ethers.Contract - constructor(options: ScannerOptions) { - if (options.provider) { - this.provider = options.provider - } else { - this.provider = new ethers.providers.JsonRpcProvider(options.ethereumUrl) + constructor(options: ScannerOptions) { + if (options.provider) { + this.provider = options.provider + } else { + this.provider = new ethers.providers.JsonRpcProvider(options.ethereumUrl) + } + this.ssvClusters = new ethers.Contract( + options.ssvNetworkAddress, ISSVClustersAbi, this.provider + ) as ISSVClusters & ethers.Contract + this.ssvOperators = new ethers.Contract( + options.ssvNetworkAddress, ISSVOperatorsAbi, this.provider + ) as ISSVOperators & ethers.Contract + this.ssvViews = new ethers.Contract( + options.ssvViewsAddress, ISSVViewsAbi, this.provider + ) as ISSVViews & ethers.Contract } - this.ssvClusters = new ethers.Contract(options.ssvNetworkAddress, ISSVClustersAbi, this.provider) as ISSVClusters & ethers.Contract - this.ssvOperators = new ethers.Contract(options.ssvNetworkAddress, ISSVOperatorsAbi, this.provider) as ISSVOperators & ethers.Contract - this.ssvViews = new ethers.Contract(options.ssvViewsAddress, ISSVViewsAbi, this.provider) as ISSVViews & ethers.Contract - } - /** + /** * Get cluster details * @param {ClusterInput} input - Operator IDs and withdrawal address * @returns {Promise} Cluster snapshot and required balance per validator */ - async getCluster(input: GetClusterInput): Promise { - const { ownerAddress, operatorIds } = input - const contractFilters = [ - this.ssvClusters.filters.ClusterDeposited(ownerAddress), - this.ssvClusters.filters.ClusterWithdrawn(ownerAddress), - this.ssvClusters.filters.ValidatorAdded(ownerAddress), - this.ssvClusters.filters.ValidatorRemoved(ownerAddress), - this.ssvClusters.filters.ClusterLiquidated(ownerAddress), - this.ssvClusters.filters.ClusterReactivated(ownerAddress) - ] - let step = this.MONTH - const latestBlockNumber = await this.provider.getBlockNumber() - let fromBlock = latestBlockNumber - step - let toBlock = latestBlockNumber - let biggestBlockNumber = 0 - let cluster: Cluster | undefined - while (!cluster && fromBlock > 0) { - try { - const items = [] - for (const filter of contractFilters) { - const filteredItems = await this.ssvClusters.queryFilter(filter, fromBlock, toBlock) - items.push(...filteredItems) - } - for (const item of items) { - const { args, blockNumber } = item - const clusterMatch = args?.cluster !== undefined - const operatorsMatch = JSON.stringify(args?.operatorIds.map(id => id.toNumber())) === JSON.stringify(operatorIds) - if (!clusterMatch || !operatorsMatch) continue - if (blockNumber > biggestBlockNumber) { - biggestBlockNumber = blockNumber - const [ - validatorCount, - networkFeeIndex, - index, - active, - balance - ] = args.cluster - cluster = { - validatorCount, - networkFeeIndex, - index, - active, - balance + async getCluster(input: GetClusterInput): Promise { + const { ownerAddress, operatorIds } = input + const contractFilters = [ + this.ssvClusters.filters.ClusterDeposited(ownerAddress), + this.ssvClusters.filters.ClusterWithdrawn(ownerAddress), + this.ssvClusters.filters.ValidatorAdded(ownerAddress), + this.ssvClusters.filters.ValidatorRemoved(ownerAddress), + this.ssvClusters.filters.ClusterLiquidated(ownerAddress), + this.ssvClusters.filters.ClusterReactivated(ownerAddress) + ] + let step = this.MONTH + const latestBlockNumber = await this.provider.getBlockNumber() + let fromBlock = latestBlockNumber - step + let toBlock = latestBlockNumber + let biggestBlockNumber = 0 + let cluster: Cluster | undefined + while (!cluster && fromBlock > 0) { + try { + const items = [] + for (const filter of contractFilters) { + const filteredItems = await this.ssvClusters.queryFilter(filter, fromBlock, toBlock) + items.push(...filteredItems) + } + for (const item of items) { + const { args, blockNumber } = item + const clusterMatch = args?.cluster !== undefined + const operatorsMatch = + JSON.stringify(args?.operatorIds.map(id => id.toNumber())) === JSON.stringify(operatorIds) + if (!clusterMatch || !operatorsMatch) continue + if (blockNumber > biggestBlockNumber) { + biggestBlockNumber = blockNumber + const [ + validatorCount, + networkFeeIndex, + index, + active, + balance + ] = args.cluster + cluster = { + validatorCount, + networkFeeIndex, + index, + active, + balance + } + } + } + toBlock = fromBlock + } catch (error) { + if (step === this.MONTH) { + step = this.WEEK + } else if (step === this.WEEK) { + step = this.DAY + } } - } + fromBlock = toBlock - step } - toBlock = fromBlock - } catch (error) { - if (step === this.MONTH) { - step = this.WEEK - } else if (step === this.WEEK) { - step = this.DAY + cluster = cluster || { + validatorCount: 0, + networkFeeIndex: 0, + index: 0, + active: true, + balance: 0 } - } - fromBlock = toBlock - step - } - cluster = cluster || { - validatorCount: 0, - networkFeeIndex: 0, - index: 0, - active: true, - balance: 0 + return cluster } - return cluster - } - /** + /** * Get validator owner nonce * @param {string} ownerAddress - Owner address * @returns {Promise} Owner validator nonce */ - async getNonce(ownerAddress: string): Promise { - const eventFilter = this.ssvClusters.filters.ValidatorAdded(ownerAddress) - const fromBlock = 0 - const toBlock = "latest" - const items = await this.ssvClusters.queryFilter(eventFilter, fromBlock, toBlock) - return items.length - } + async getNonce(ownerAddress: string): Promise { + const eventFilter = this.ssvClusters.filters.ValidatorAdded(ownerAddress) + const fromBlock = 0 + const toBlock = "latest" + const items = await this.ssvClusters.queryFilter(eventFilter, fromBlock, toBlock) + return items.length + } - /** + /** * Get minimum required validator fee * @param {number[]} operatorIds - Operator IDs * @returns {Promise} Validator fee */ - async getRequiredFee(operatorIds: number[]): Promise { - let feeSum = await this.ssvViews.getNetworkFee() - for (const operatorId of operatorIds) { - const operatorFee = await this.ssvViews.getOperatorFee(operatorId) - feeSum = feeSum.add(operatorFee) + async getRequiredFee(operatorIds: number[]): Promise { + let feeSum = await this.ssvViews.getNetworkFee() + for (const operatorId of operatorIds) { + const operatorFee = await this.ssvViews.getOperatorFee(operatorId) + feeSum = feeSum.add(operatorFee) + } + const liquidationThresholdPeriod = await this.ssvViews.getLiquidationThresholdPeriod() + return feeSum.mul(liquidationThresholdPeriod).mul(6) } - const liquidationThresholdPeriod = await this.ssvViews.getLiquidationThresholdPeriod() - return feeSum.mul(liquidationThresholdPeriod).mul(6) - } - /** + /** * Get operators by owner address * @param {string} ownerAddress - Owner address * @returns {Promise} The owner's operators */ - async getOperators(ownerAddress: string): Promise { - const eventFilter = this.ssvOperators.filters.OperatorAdded(null, ownerAddress) - const operators: Operator[] = [] - const items = await this.ssvOperators.queryFilter(eventFilter, 0, "latest") - for (const item of items) { - const { args } = item - const { operatorId } = args - const { fee, validatorCount, isPrivate } = await this.ssvViews.getOperatorById(operatorId) - operators.push({ - id: operatorId.toNumber(), - fee, - ownerAddress, - validatorCount, - isPrivate - }) + async getOperators(ownerAddress: string): Promise { + const eventFilter = this.ssvOperators.filters.OperatorAdded(null, ownerAddress) + const operators: Operator[] = [] + const items = await this.ssvOperators.queryFilter(eventFilter, 0, "latest") + for (const item of items) { + const { args } = item + const { operatorId } = args + const { fee, validatorCount, isPrivate } = await this.ssvViews.getOperatorById(operatorId) + operators.push({ + id: operatorId.toNumber(), + fee, + ownerAddress, + validatorCount, + isPrivate + }) + } + return operators } - return operators - } } \ No newline at end of file diff --git a/common/types/src/index.ts b/common/types/src/index.ts index 5858d4d2f..81fdcf82a 100644 --- a/common/types/src/index.ts +++ b/common/types/src/index.ts @@ -42,49 +42,49 @@ import { UserWithAccountsAndOperators } from "./interfaces/UserWithAccountsAndOp import { Validator } from "./interfaces/Validator" export type { - Account, - AccountWithStakingAndOperatorInfo, - ApiResponse, - AddAccountOptions, - AnalyticsData, - Article, - BalanceSnapshot, - BreakdownAmount, - BreakdownString, - BrowserProviders, - ContractArgs, - ContractConfig, - ContractEventsByAddress, - CryptoAddress, - Currency, - DeploymentConfig, - EthersProvider, - Event, - ExistingUserCheck, - FormattedWalletOption, - GasEstimate, - HackmdArticle, - LoginCredentials, - ManagerConfig, - MessageRequest, - Operator, - OperatorAddedSuccess, - PoolConfig, - ProviderString, - SignInWithEthereumCredentials, - TransactionRequest, - RegisteredOperator, - RegisterOperatorWithCasimirParams, - RemoveAccountOptions, - Reshare, - User, - UserAddedSuccess, - UserAnalyticsData, - UserAuthState, - UserWithAccountsAndOperators, - Validator + Account, + AccountWithStakingAndOperatorInfo, + ApiResponse, + AddAccountOptions, + AnalyticsData, + Article, + BalanceSnapshot, + BreakdownAmount, + BreakdownString, + BrowserProviders, + ContractArgs, + ContractConfig, + ContractEventsByAddress, + CryptoAddress, + Currency, + DeploymentConfig, + EthersProvider, + Event, + ExistingUserCheck, + FormattedWalletOption, + GasEstimate, + HackmdArticle, + LoginCredentials, + ManagerConfig, + MessageRequest, + Operator, + OperatorAddedSuccess, + PoolConfig, + ProviderString, + SignInWithEthereumCredentials, + TransactionRequest, + RegisteredOperator, + RegisterOperatorWithCasimirParams, + RemoveAccountOptions, + Reshare, + User, + UserAddedSuccess, + UserAnalyticsData, + UserAuthState, + UserWithAccountsAndOperators, + Validator } export { - PoolStatus + PoolStatus } diff --git a/common/uniswap/src/providers/factory.ts b/common/uniswap/src/providers/factory.ts index ce25ab854..2cddf9965 100644 --- a/common/uniswap/src/providers/factory.ts +++ b/common/uniswap/src/providers/factory.ts @@ -6,31 +6,33 @@ import IUniswapV3PoolStateAbi from "@casimir/ethereum/build/abi/IUniswapV3PoolSt import { IUniswapV3Factory, IUniswapV3PoolState } from "@casimir/ethereum/build/@types" export class Factory { - provider: ethers.providers.JsonRpcProvider - uniswapV3Factory: IUniswapV3Factory & ethers.Contract + provider: ethers.providers.JsonRpcProvider + uniswapV3Factory: IUniswapV3Factory & ethers.Contract - constructor(options: FactoryOptions) { - if (options.provider) { - this.provider = options.provider - } else { - this.provider = new ethers.providers.JsonRpcProvider(options.ethereumUrl) + constructor(options: FactoryOptions) { + if (options.provider) { + this.provider = options.provider + } else { + this.provider = new ethers.providers.JsonRpcProvider(options.ethereumUrl) + } + this.uniswapV3Factory = new ethers.Contract( + options.uniswapV3FactoryAddress, IUniswapV3FactoryAbi, this.provider + ) as IUniswapV3Factory & ethers.Contract } - this.uniswapV3Factory = new ethers.Contract( - options.uniswapV3FactoryAddress, IUniswapV3FactoryAbi, this.provider - ) as IUniswapV3Factory & ethers.Contract - } - /** + /** * Get the swap price for a given token pair * @param {PriceInput} input - Token in, token out, and uniswap fee tier * @returns {Promise} Swap price */ - getSwapPrice = async (input: PriceInput): Promise => { - const { tokenIn, tokenOut, uniswapFeeTier } = input - const poolAddress = await this.uniswapV3Factory.getPool(tokenIn, tokenOut, uniswapFeeTier) - const poolContract = new ethers.Contract(poolAddress, IUniswapV3PoolStateAbi, this.provider) as IUniswapV3PoolState & ethers.Contract - const slot0 = await poolContract.slot0() - const tick = slot0.tick - return 1.0001 ** tick - } + getSwapPrice = async (input: PriceInput): Promise => { + const { tokenIn, tokenOut, uniswapFeeTier } = input + const poolAddress = await this.uniswapV3Factory.getPool(tokenIn, tokenOut, uniswapFeeTier) + const poolContract = new ethers.Contract( + poolAddress, IUniswapV3PoolStateAbi, this.provider + ) as IUniswapV3PoolState & ethers.Contract + const slot0 = await poolContract.slot0() + const tick = slot0.tick + return 1.0001 ** tick + } } \ No newline at end of file diff --git a/common/wallets/src/index.ts b/common/wallets/src/index.ts index 31c0320e2..552241e61 100644 --- a/common/wallets/src/index.ts +++ b/common/wallets/src/index.ts @@ -2,7 +2,7 @@ import { /*BitcoinLedgerSigner, */EthersLedgerSigner } from "./providers/ledger" import { EthersTrezorSigner } from "./providers/trezor" export { - /*BitcoinLedgerSigner,*/ - EthersLedgerSigner, - EthersTrezorSigner + /*BitcoinLedgerSigner,*/ + EthersLedgerSigner, + EthersTrezorSigner } \ No newline at end of file diff --git a/common/wallets/src/providers/ledger.ts b/common/wallets/src/providers/ledger.ts index 5cdb525e7..80583d762 100644 --- a/common/wallets/src/providers/ledger.ts +++ b/common/wallets/src/providers/ledger.ts @@ -6,9 +6,9 @@ import TransportWebUSB from "@ledgerhq/hw-transport-webusb" import { CryptoAddress } from "@casimir/types" const transports = { - "usb": async function createUSBTransport(): Promise { - return await TransportWebUSB.create() - } + "usb": async function createUSBTransport(): Promise { + return await TransportWebUSB.create() + } } export interface LedgerSignerOptions { @@ -120,146 +120,149 @@ export interface LedgerSignerOptions { // } export class EthersLedgerSigner extends ethers.Signer { - readonly type: string = "usb" - readonly path: string = "m/44'/60'/0'/0/0" - readonly eth?: Promise + readonly type: string = "usb" + readonly path: string = "m/44'/60'/0'/0/0" + readonly eth?: Promise - constructor(options: LedgerSignerOptions) { - super() + constructor(options: LedgerSignerOptions) { + super() - if (options.type) this.type = options.type - if (options.path) this.path = options.path + if (options.type) this.type = options.type + if (options.path) this.path = options.path - // Override readonly provider for ethers.Signer - if (options.provider) { - ethers.utils.defineReadOnly(this, "provider", options.provider) - } + // Override readonly provider for ethers.Signer + if (options.provider) { + ethers.utils.defineReadOnly(this, "provider", options.provider) + } - // Set readonly eth to Promise - const transportCreatorType = this.type as keyof typeof transports - const transportCreator = transports[transportCreatorType] - if (!transportCreator) console.log("Unknown or unsupported type", this.type) - ethers.utils.defineReadOnly(this, "eth", transportCreator().then(transport => { - return new Eth(transport) - })) - } + // Set readonly eth to Promise + const transportCreatorType = this.type as keyof typeof transports + const transportCreator = transports[transportCreatorType] + if (!transportCreator) console.log("Unknown or unsupported type", this.type) + ethers.utils.defineReadOnly(this, "eth", transportCreator().then(transport => { + return new Eth(transport) + })) + } - retry(callback: (eth: Eth) => Promise, timeout?: number): Promise { + retry(callback: (eth: Eth) => Promise, timeout?: number): Promise { // The async-promise-executor is ok since retry handles necessary errors // eslint-disable-next-line no-async-promise-executor - return new Promise(async (resolve, reject) => { - const ledgerConnectionError = "Please make sure Ledger is ready and retry" - if (timeout && timeout > 0) { - setTimeout(() => reject(new Error(ledgerConnectionError)), timeout) - } - - const eth = await this.eth as Eth - - // Wait up to 5 seconds - for (let i = 0; i < 50; i++) { - try { - const result = await callback(eth) - return resolve(result) - } catch (error) { - if ((error as { id: string }).id !== "TransportLocked") { - return reject(error) - } - } - await new Promise((resolve) => { - setTimeout(resolve, 100) + return new Promise(async (resolve, reject) => { + const ledgerConnectionError = "Please make sure Ledger is ready and retry" + if (timeout && timeout > 0) { + setTimeout(() => reject(new Error(ledgerConnectionError)), timeout) + } + + const eth = await this.eth as Eth + + // Wait up to 5 seconds + for (let i = 0; i < 50; i++) { + try { + const result = await callback(eth) + return resolve(result) + } catch (error) { + if ((error as { id: string }).id !== "TransportLocked") { + return reject(error) + } + } + await new Promise((resolve) => { + setTimeout(resolve, 100) + }) + } + + return reject(new Error(ledgerConnectionError)) }) - } - - return reject(new Error(ledgerConnectionError)) - }) - } + } - async getAddresses(): Promise | null> { - const ledgerAddresses = [] + async getAddresses(): Promise | null> { + const ledgerAddresses = [] - for (let i = 0; i < 5; i++) { - // m/coin_type'/account_index'/external_chain_index'/address_index/change_index - const path = `m/44'/60'/${i}'/0/0` - const { address } = await this.retry((eth) => eth.getAddress(path)) - // TODO: Replace with our own provider depending on environment - const provider = new ethers.providers.JsonRpcProvider("https://goerli.infura.io/v3/4e8acb4e58bb4cb9978ac4a22f3326a7") - const balance = await provider.getBalance(address) - const ethBalance = ethers.utils.formatEther(balance) - if (parseFloat(ethBalance) > 0) ledgerAddresses.push({ address, balance: ethBalance, pathIndex: i.toString() }) + for (let i = 0; i < 5; i++) { + // m/coin_type'/account_index'/external_chain_index'/address_index/change_index + const path = `m/44'/60'/${i}'/0/0` + const { address } = await this.retry((eth) => eth.getAddress(path)) + // TODO: Replace with our own provider depending on environment + const provider = new ethers.providers.JsonRpcProvider("https://goerli.infura.io/v3/4e8acb4e58bb4cb9978ac4a22f3326a7") + const balance = await provider.getBalance(address) + const ethBalance = ethers.utils.formatEther(balance) + if (parseFloat(ethBalance) > 0) + ledgerAddresses.push({ address, balance: ethBalance, pathIndex: i.toString() }) + } + return ledgerAddresses.length ? ledgerAddresses : null } - return ledgerAddresses.length ? ledgerAddresses : null - } - async getAddress(): Promise { - const { address } = await this.retry((eth) => eth.getAddress(this.path)) - return address - } + async getAddress(): Promise { + const { address } = await this.retry((eth) => eth.getAddress(this.path)) + return address + } - async signMessage(message: ethers.utils.Bytes | string): Promise { - if (typeof (message) === "string") { - message = ethers.utils.toUtf8Bytes(message) + async signMessage(message: ethers.utils.Bytes | string): Promise { + if (typeof (message) === "string") { + message = ethers.utils.toUtf8Bytes(message) + } + const messageHex = ethers.utils.hexlify(message).substring(2) + const testPath = "m/44'/60'/1'/0/0" + const signature = await this.retry((eth) => eth.signPersonalMessage(testPath, messageHex)) + signature.r = "0x" + signature.r + signature.s = "0x" + signature.s + return ethers.utils.joinSignature(signature) } - const messageHex = ethers.utils.hexlify(message).substring(2) - const testPath = "m/44'/60'/1'/0/0" - const signature = await this.retry((eth) => eth.signPersonalMessage(testPath, messageHex)) - signature.r = "0x" + signature.r - signature.s = "0x" + signature.s - return ethers.utils.joinSignature(signature) - } - async signMessageWithIndex(message: ethers.utils.Bytes | string, pathIndex: number): Promise { - if (typeof (message) === "string") { - console.log("message :>> ", message) - message = ethers.utils.toUtf8Bytes(message) + async signMessageWithIndex(message: ethers.utils.Bytes | string, pathIndex: number): Promise { + if (typeof (message) === "string") { + console.log("message :>> ", message) + message = ethers.utils.toUtf8Bytes(message) + } + const messageHex = ethers.utils.hexlify(message).substring(2) + const path = `m/44'/60'/${pathIndex}'/0/0` + const signature = await this.retry((eth) => eth.signPersonalMessage(path, messageHex)) + console.log("signature :>> ", signature) + signature.r = "0x" + signature.r + signature.s = "0x" + signature.s + console.log("signature :>> ", signature) + return ethers.utils.joinSignature(signature) } - const messageHex = ethers.utils.hexlify(message).substring(2) - const path = `m/44'/60'/${pathIndex}'/0/0` - const signature = await this.retry((eth) => eth.signPersonalMessage(path, messageHex)) - console.log("signature :>> ", signature) - signature.r = "0x" + signature.r - signature.s = "0x" + signature.s - console.log("signature :>> ", signature) - return ethers.utils.joinSignature(signature) - } - - async signTransaction(transaction: ethers.providers.TransactionRequest): Promise { - const tx = await ethers.utils.resolveProperties(transaction) - const baseTx: ethers.utils.UnsignedTransaction = { - chainId: (tx.chainId || undefined), - data: (tx.data || undefined), - gasLimit: (tx.gasLimit || undefined), - gasPrice: (tx.gasPrice || undefined), - nonce: (tx.nonce ? ethers.BigNumber.from(tx.nonce).toNumber() : undefined), - to: (tx.to || undefined), - value: (tx.value || undefined), - type: (tx.type || undefined) + + async signTransaction(transaction: ethers.providers.TransactionRequest): Promise { + const tx = await ethers.utils.resolveProperties(transaction) + const baseTx: ethers.utils.UnsignedTransaction = { + chainId: (tx.chainId || undefined), + data: (tx.data || undefined), + gasLimit: (tx.gasLimit || undefined), + gasPrice: (tx.gasPrice || undefined), + nonce: (tx.nonce ? ethers.BigNumber.from(tx.nonce).toNumber() : undefined), + to: (tx.to || undefined), + value: (tx.value || undefined), + type: (tx.type || undefined) + } + + const unsignedTx = ethers.utils.serializeTransaction(baseTx).substring(2) + const resolution = await ledgerService.resolveTransaction(unsignedTx, {}, {}) + const signature = await this.retry((eth) => eth.signTransaction(this.path, unsignedTx, resolution)) + + return ethers.utils.serializeTransaction(baseTx, { + v: ethers.BigNumber.from("0x" + signature.v).toNumber(), + r: ("0x" + signature.r), + s: ("0x" + signature.s), + }) + } + + // Populates all fields in a transaction, signs it and sends it to the network + async sendTransaction(transaction: ethers.utils.Deferrable) + : Promise + { + this._checkProvider("sendTransaction") + const tx = await this.populateTransaction(transaction) + const signedTx = await this.signTransaction(tx) + return await (this.provider as ethers.providers.JsonRpcProvider).sendTransaction(signedTx) } - const unsignedTx = ethers.utils.serializeTransaction(baseTx).substring(2) - const resolution = await ledgerService.resolveTransaction(unsignedTx, {}, {}) - const signature = await this.retry((eth) => eth.signTransaction(this.path, unsignedTx, resolution)) - - return ethers.utils.serializeTransaction(baseTx, { - v: ethers.BigNumber.from("0x" + signature.v).toNumber(), - r: ("0x" + signature.r), - s: ("0x" + signature.s), - }) - } - - // Populates all fields in a transaction, signs it and sends it to the network - async sendTransaction(transaction: ethers.utils.Deferrable): Promise { - this._checkProvider("sendTransaction") - const tx = await this.populateTransaction(transaction) - const signedTx = await this.signTransaction(tx) - return await (this.provider as ethers.providers.JsonRpcProvider).sendTransaction(signedTx) - } - - connect(provider: ethers.providers.Provider): ethers.Signer { - const options = { - provider, - type: this.type, - path: this.path + connect(provider: ethers.providers.Provider): ethers.Signer { + const options = { + provider, + type: this.type, + path: this.path + } + return new EthersLedgerSigner(options) } - return new EthersLedgerSigner(options) - } } \ No newline at end of file diff --git a/common/wallets/src/providers/trezor.ts b/common/wallets/src/providers/trezor.ts index 6053ae474..25ec5633d 100644 --- a/common/wallets/src/providers/trezor.ts +++ b/common/wallets/src/providers/trezor.ts @@ -15,133 +15,139 @@ export interface TrezorSignerOptions { TrezorConnect.manifest({ email: "support@consensusnetworks.com", appUrl: "casimir.co" }) export class EthersTrezorSigner extends ethers.Signer { - readonly path: string = "m/44'/60'/0'/0/0" - readonly eth = TrezorConnect + readonly path: string = "m/44'/60'/0'/0/0" + readonly eth = TrezorConnect - constructor(options: TrezorSignerOptions) { - super() + constructor(options: TrezorSignerOptions) { + super() - /** Override readonly wallet path */ - if (options.path) this.path = options.path + /** Override readonly wallet path */ + if (options.path) this.path = options.path - // Override readonly provider for ethers.Signer - if (options.provider) { - ethers.utils.defineReadOnly(this, "provider", options.provider) + // Override readonly provider for ethers.Signer + if (options.provider) { + ethers.utils.defineReadOnly(this, "provider", options.provider) + } + } - } - - async getAddress(): Promise { - const { payload } = await this.eth.ethereumGetAddress({ path: this.path }) - const { address } = payload as Address - return ethers.utils.getAddress(address) - } - - async getAddresses(): Promise> { - const trezorAddresses = [] - const bundle = [] - for (let i = 0; i < 5; i++) { - // TODO: Figure out how to access Goerli derivation paths - // m/coin_type'/account_index'/external_chain_index'/address_index/change_index - // const path = `m/44'/60'/${i}'/0/0` // Mainnet - // const path = `m/44'/1'/${i}'/0/0` // Ropsten - const path = `m/44'/60'/${i}'/0/0` // Goerli? - bundle.push({ path, showOnTrezor: false }) + async getAddress(): Promise { + const { payload } = await this.eth.ethereumGetAddress({ path: this.path }) + const { address } = payload as Address + return ethers.utils.getAddress(address) } - const { payload } = await this.eth.ethereumGetAddress({ bundle }) as any + + async getAddresses(): Promise> { + const trezorAddresses = [] + const bundle = [] + for (let i = 0; i < 5; i++) { + // TODO: Figure out how to access Goerli derivation paths + // m/coin_type'/account_index'/external_chain_index'/address_index/change_index + // const path = `m/44'/60'/${i}'/0/0` // Mainnet + // const path = `m/44'/1'/${i}'/0/0` // Ropsten + const path = `m/44'/60'/${i}'/0/0` // Goerli? + bundle.push({ path, showOnTrezor: false }) + } + const { payload } = await this.eth.ethereumGetAddress({ bundle }) as any - for (let i = 0; i < payload.length; i++) { - const { address } = payload[i] - // TODO: Replace with our own provider depending on environment - const provider = new ethers.providers.JsonRpcProvider("https://goerli.infura.io/v3/4e8acb4e58bb4cb9978ac4a22f3326a7") - const modifiedAddress = address.toLowerCase().trim() - const balance = await provider.getBalance(modifiedAddress) - const ethBalance = ethers.utils.formatEther(balance) - // if (parseFloat(ethBalance) > 0) trezorAddresses.push({ address, balance: ethBalance, index: i.toString() }) // TODO: Uncomment this line; it is currently commented out for testing - trezorAddresses.push({ address, balance: ethBalance, pathIndex: i.toString() }) // TODO: Remove this line; it is currently for testing + for (let i = 0; i < payload.length; i++) { + const { address } = payload[i] + // TODO: Replace with our own provider depending on environment + const provider = new ethers.providers.JsonRpcProvider("https://goerli.infura.io/v3/4e8acb4e58bb4cb9978ac4a22f3326a7") + const modifiedAddress = address.toLowerCase().trim() + const balance = await provider.getBalance(modifiedAddress) + const ethBalance = ethers.utils.formatEther(balance) + // if (parseFloat(ethBalance) > 0) trezorAddresses.push({ address, balance: ethBalance, index: i.toString() }) // TODO: Uncomment this line; it is currently commented out for testing + trezorAddresses.push( + { address, balance: ethBalance, pathIndex: i.toString() } + ) // TODO: Remove this line; it is currently for testing + } + return trezorAddresses.length ? trezorAddresses : [] } - return trezorAddresses.length ? trezorAddresses : [] - } - - async signMessage(message: ethers.utils.Bytes | string): Promise { - if (typeof(message) === "string") message = ethers.utils.toUtf8Bytes(message) - const messageHex = ethers.utils.hexlify(message).substring(2) - const { payload } = await this.eth.ethereumSignMessage({ path: this.path, message: messageHex, hex: true }) - const { signature } = payload as TrezorMessageSignature - return signature - } - - async signMessageWithIndex(message: ethers.utils.Bytes | string, pathIndex: number): Promise { - if (typeof (message) === "string") message = ethers.utils.toUtf8Bytes(message) - const messageHex = ethers.utils.hexlify(message).substring(2) - const path = `m/44'/60'/${pathIndex}'/0/0` - const { payload } = await this.eth.ethereumSignMessage({ path, message: messageHex, hex: true }) - const { signature } = payload as TrezorMessageSignature - const convertedSignature = convertSignature(signature) - return convertedSignature - } - - async signTransaction(transaction: ethers.providers.TransactionRequest): Promise { - transaction.value = ethers.BigNumber.from(transaction.value).toHexString() - transaction.gasLimit = ethers.BigNumber.from(transaction.gasLimit).toHexString() - transaction.gasPrice = ethers.BigNumber.from(transaction.gasPrice).toHexString() - transaction.nonce = ethers.BigNumber.from(transaction.nonce).toHexString() - - const unsignedTx: EthereumTransaction = { - to: transaction.to as string, - value: transaction.value as string, - data: transaction.data as string | undefined, - chainId: transaction.chainId as number, - nonce: transaction.nonce as string, - gasLimit: transaction.gasLimit as string, - gasPrice: transaction.gasPrice as string, - // Todo fix type - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore - type: transaction.type as number + + async signMessage(message: ethers.utils.Bytes | string): Promise { + if (typeof(message) === "string") message = ethers.utils.toUtf8Bytes(message) + const messageHex = ethers.utils.hexlify(message).substring(2) + const { payload } = await this.eth.ethereumSignMessage({ path: this.path, message: messageHex, hex: true }) + const { signature } = payload as TrezorMessageSignature + return signature } - const ethereumSignedTransaction = await this.eth.ethereumSignTransaction({ path: this.path, transaction: unsignedTx }) - const { payload } = ethereumSignedTransaction - - const signature = payload as EthereumSignedTx - const baseTx: ethers.utils.UnsignedTransaction = { - ...unsignedTx, - nonce: ethers.BigNumber.from(transaction.nonce).toNumber(), + async signMessageWithIndex(message: ethers.utils.Bytes | string, pathIndex: number): Promise { + if (typeof (message) === "string") message = ethers.utils.toUtf8Bytes(message) + const messageHex = ethers.utils.hexlify(message).substring(2) + const path = `m/44'/60'/${pathIndex}'/0/0` + const { payload } = await this.eth.ethereumSignMessage({ path, message: messageHex, hex: true }) + const { signature } = payload as TrezorMessageSignature + const convertedSignature = convertSignature(signature) + return convertedSignature } - const signedTransaction = ethers.utils.serializeTransaction(baseTx, { - v: ethers.BigNumber.from(signature.v).toNumber(), - r: signature.r, - s: signature.s, - }) - return signedTransaction - } + async signTransaction(transaction: ethers.providers.TransactionRequest): Promise { + transaction.value = ethers.BigNumber.from(transaction.value).toHexString() + transaction.gasLimit = ethers.BigNumber.from(transaction.gasLimit).toHexString() + transaction.gasPrice = ethers.BigNumber.from(transaction.gasPrice).toHexString() + transaction.nonce = ethers.BigNumber.from(transaction.nonce).toHexString() + + const unsignedTx: EthereumTransaction = { + to: transaction.to as string, + value: transaction.value as string, + data: transaction.data as string | undefined, + chainId: transaction.chainId as number, + nonce: transaction.nonce as string, + gasLimit: transaction.gasLimit as string, + gasPrice: transaction.gasPrice as string, + // Todo fix type + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore + type: transaction.type as number + } + + const ethereumSignedTransaction = await this.eth.ethereumSignTransaction( + { path: this.path, transaction: unsignedTx } + ) + const { payload } = ethereumSignedTransaction + + const signature = payload as EthereumSignedTx + const baseTx: ethers.utils.UnsignedTransaction = { + ...unsignedTx, + nonce: ethers.BigNumber.from(transaction.nonce).toNumber(), + } + + const signedTransaction = ethers.utils.serializeTransaction(baseTx, { + v: ethers.BigNumber.from(signature.v).toNumber(), + r: signature.r, + s: signature.s, + }) + return signedTransaction + } - async sendTransaction(transaction: ethers.utils.Deferrable): Promise { - this._checkProvider("sendTransaction") + async sendTransaction(transaction: ethers.utils.Deferrable) + : Promise + { + this._checkProvider("sendTransaction") - transaction.gasLimit = await this?.provider?.estimateGas(transaction) - transaction.gasPrice = await this?.provider?.getGasPrice() - transaction.nonce = await this?.provider?.getTransactionCount(await this.getAddress()) - transaction.chainId = 1337 - - const signedTx = await this.signTransaction(transaction as ethers.providers.TransactionRequest) - return await (this.provider as ethers.providers.JsonRpcProvider).sendTransaction(signedTx) - } - - connect(provider: ethers.providers.Provider): ethers.Signer { - const options = { - provider, - path: this.path + transaction.gasLimit = await this?.provider?.estimateGas(transaction) + transaction.gasPrice = await this?.provider?.getGasPrice() + transaction.nonce = await this?.provider?.getTransactionCount(await this.getAddress()) + transaction.chainId = 1337 + + const signedTx = await this.signTransaction(transaction as ethers.providers.TransactionRequest) + return await (this.provider as ethers.providers.JsonRpcProvider).sendTransaction(signedTx) + } + + connect(provider: ethers.providers.Provider): ethers.Signer { + const options = { + provider, + path: this.path + } + return new EthersTrezorSigner(options) } - return new EthersTrezorSigner(options) - } } function convertSignature(signature: string): string { - const r = "0x" + signature.slice(0, 64) - const s = "0x" + signature.slice(64, 128) - const v = parseInt("0x" + signature.slice(128, 130), 16) - return ethers.utils.joinSignature({ r, s, v }) + const r = "0x" + signature.slice(0, 64) + const s = "0x" + signature.slice(64, 128) + const v = parseInt("0x" + signature.slice(128, 130), 16) + return ethers.utils.joinSignature({ r, s, v }) } \ No newline at end of file diff --git a/common/wallets/src/providers/walletConnect.ts b/common/wallets/src/providers/walletConnect.ts index 83bcc347a..6b5cc9164 100644 --- a/common/wallets/src/providers/walletConnect.ts +++ b/common/wallets/src/providers/walletConnect.ts @@ -14,51 +14,55 @@ interface WalletAddressSignerOptions { } export class EthersWalletConnectSigner extends ethers.Signer { - private _ethereumProvider: UniversalProvider - private _web3Provider: providers.Web3Provider + private _ethereumProvider: UniversalProvider + private _web3Provider: providers.Web3Provider - private constructor(options: WalletAddressSignerOptions, ethereumProvider: UniversalProvider, web3Provider: providers.Web3Provider) { - super() + private constructor( + options: WalletAddressSignerOptions, + ethereumProvider: UniversalProvider, + web3Provider: providers.Web3Provider + ) { + super() - this._ethereumProvider = ethereumProvider - this._web3Provider = web3Provider + this._ethereumProvider = ethereumProvider + this._web3Provider = web3Provider - if (options.provider) { - console.log("got to options.provider") - ethers.utils.defineReadOnly(this, "provider", options.provider) - } else { - console.log("web3Provider in !options.provider :>> ", web3Provider) - console.log("ethereumProvider :>> ", ethereumProvider) - ethers.utils.defineReadOnly(this, "provider", web3Provider) + if (options.provider) { + console.log("got to options.provider") + ethers.utils.defineReadOnly(this, "provider", options.provider) + } else { + console.log("web3Provider in !options.provider :>> ", web3Provider) + console.log("ethereumProvider :>> ", ethereumProvider) + ethers.utils.defineReadOnly(this, "provider", web3Provider) + } } - } - static async create(options: WalletAddressSignerOptions): Promise { - const ethereumProvider = await UniversalProvider.init({ - projectId: DEFAULT_PROJECT_ID, - logger: DEFAULT_LOGGER, - relayUrl: DEFAULT_RELAY_URL, - }) + static async create(options: WalletAddressSignerOptions): Promise { + const ethereumProvider = await UniversalProvider.init({ + projectId: DEFAULT_PROJECT_ID, + logger: DEFAULT_LOGGER, + relayUrl: DEFAULT_RELAY_URL, + }) - const web3Provider = new providers.Web3Provider(ethereumProvider) + const web3Provider = new providers.Web3Provider(ethereumProvider) - return new EthersWalletConnectSigner(options, ethereumProvider, web3Provider) - } + return new EthersWalletConnectSigner(options, ethereumProvider, web3Provider) + } - async getAddress(): Promise { - return "0x" - } + async getAddress(): Promise { + return "0x" + } - async signMessage(message: string | ethers.Bytes): Promise { - return "0x" - } + async signMessage(message: string | ethers.Bytes): Promise { + return "0x" + } - async signTransaction(tx: ethers.providers.TransactionRequest): Promise { - return "0x" - } + async signTransaction(tx: ethers.providers.TransactionRequest): Promise { + return "0x" + } - connect(provider: ethers.providers.Provider): ethers.Signer { - return new EthersWalletConnectSigner() - } + connect(provider: ethers.providers.Provider): ethers.Signer { + return new EthersWalletConnectSigner() + } } diff --git a/contracts/ethereum/hardhat.config.ts b/contracts/ethereum/hardhat.config.ts index 33cfcd184..bca50f36b 100644 --- a/contracts/ethereum/hardhat.config.ts +++ b/contracts/ethereum/hardhat.config.ts @@ -53,105 +53,106 @@ process.env.SWAP_ROUTER_ADDRESS = ETHEREUM_CONTRACTS[networkKey].SWAP_ROUTER_ADD process.env.WETH_TOKEN_ADDRESS = ETHEREUM_CONTRACTS[networkKey].WETH_TOKEN_ADDRESS const compilerSettings = { - viaIR: true, - optimizer: { - enabled: true - } + viaIR: true, + optimizer: { + enabled: true + } } const compilerVersions = ["0.8.18"] const externalCompilerVersions = ["0.4.22", - "0.4.24", - "0.6.6", - "0.6.11", - "0.8.4"] -const compilers = [...compilerVersions, ...externalCompilerVersions].map(version => ({ version, settings: compilerSettings })) + "0.4.24", + "0.6.6", + "0.6.11", + "0.8.4"] +const compilers = [...compilerVersions, ...externalCompilerVersions] + .map(version => ({ version, settings: compilerSettings })) // Go to https://hardhat.org/config/ to learn more const config: HardhatUserConfig = { - etherscan: { - apiKey: "XZCVTJSMVTZ78RYAHDAUXDPRSFW8NKIGW9" - }, - mocha: { - timeout: 60000 - }, - solidity: { - compilers, - }, - paths: { - tests: "./test", - sources: "./src/v1", - artifacts: "./build/artifacts", - cache: "./build/cache" - }, - abiExporter: { - path: "./build/abi", - runOnCompile: true, - clear: true, - flat: true, - spacing: 4, - format: "fullName" - }, - typechain: { - outDir: "./build/@types" - }, - docgen: { - exclude: [ - "dev", - "libraries", - "mock", - "vendor" - ], - outputDir: process.env.DOCS_OUTPUT_DIR || "./build/docs", - templates: process.env.DOCS_TEMPLATE_DIR, - pages: () => "solidity-api.md" - }, - networks: { - hardhat: { - accounts: mnemonic ? hid : undefined, - chainId: forkChainId || 1337, - forking: forkUrl ? forkConfig : undefined, - mining: miningInterval ? mining : { auto: true }, - allowUnlimitedContractSize: true, - gas: "auto", - gasPrice: "auto" + etherscan: { + apiKey: "XZCVTJSMVTZ78RYAHDAUXDPRSFW8NKIGW9" + }, + mocha: { + timeout: 60000 + }, + solidity: { + compilers, + }, + paths: { + tests: "./test", + sources: "./src/v1", + artifacts: "./build/artifacts", + cache: "./build/cache" }, - mainnet: { - accounts: mnemonic ? hid : undefined, - url: process.env.ETHEREUM_RPC_URL || "", - allowUnlimitedContractSize: true, - gas: "auto", - gasPrice: "auto" + abiExporter: { + path: "./build/abi", + runOnCompile: true, + clear: true, + flat: true, + spacing: 4, + format: "fullName" }, - goerli: { - accounts: mnemonic ? hid : undefined, - url: process.env.ETHEREUM_RPC_URL || "", - allowUnlimitedContractSize: true, - gas: "auto", - gasPrice: "auto" + typechain: { + outDir: "./build/@types" + }, + docgen: { + exclude: [ + "dev", + "libraries", + "mock", + "vendor" + ], + outputDir: process.env.DOCS_OUTPUT_DIR || "./build/docs", + templates: process.env.DOCS_TEMPLATE_DIR, + pages: () => "solidity-api.md" + }, + networks: { + hardhat: { + accounts: mnemonic ? hid : undefined, + chainId: forkChainId || 1337, + forking: forkUrl ? forkConfig : undefined, + mining: miningInterval ? mining : { auto: true }, + allowUnlimitedContractSize: true, + gas: "auto", + gasPrice: "auto" + }, + mainnet: { + accounts: mnemonic ? hid : undefined, + url: process.env.ETHEREUM_RPC_URL || "", + allowUnlimitedContractSize: true, + gas: "auto", + gasPrice: "auto" + }, + goerli: { + accounts: mnemonic ? hid : undefined, + url: process.env.ETHEREUM_RPC_URL || "", + allowUnlimitedContractSize: true, + gas: "auto", + gasPrice: "auto" + } } - } } // Start a local tunnel for using RPC over https (e.g. for Metamask on mobile) if (process.env.TUNNEL === "true") { - runLocalTunnel() + runLocalTunnel() } function runLocalTunnel() { - const localSubdomain = `local-hardhat-${os.userInfo().username.toLowerCase()}` - const localUrl = `https://${localSubdomain}.loca.lt` - localtunnel({ port: 8545, subdomain: localSubdomain }).then( - (tunnel: localtunnel.Tunnel) => { - if (localUrl === tunnel.url) { - console.log("Your default local tunnel url is", localUrl) - } else { - console.log("Your default local tunnel url is not available, use", tunnel.url, "instead") - } - process.on("SIGINT", () => { - tunnel.close() - }) - } - ) + const localSubdomain = `local-hardhat-${os.userInfo().username.toLowerCase()}` + const localUrl = `https://${localSubdomain}.loca.lt` + localtunnel({ port: 8545, subdomain: localSubdomain }).then( + (tunnel: localtunnel.Tunnel) => { + if (localUrl === tunnel.url) { + console.log("Your default local tunnel url is", localUrl) + } else { + console.log("Your default local tunnel url is not available, use", tunnel.url, "instead") + } + process.on("SIGINT", () => { + tunnel.close() + }) + } + ) } export default config \ No newline at end of file diff --git a/contracts/ethereum/helpers/math.ts b/contracts/ethereum/helpers/math.ts index 9126e8310..e72ac9769 100644 --- a/contracts/ethereum/helpers/math.ts +++ b/contracts/ethereum/helpers/math.ts @@ -1,4 +1,4 @@ export function round(num: number, decimals: number | undefined = 1) { - const multiplier = Math.pow(10, decimals) - return Math.round(num * multiplier) / multiplier + const multiplier = Math.pow(10, decimals) + return Math.round(num * multiplier) / multiplier } \ No newline at end of file diff --git a/contracts/ethereum/helpers/network.ts b/contracts/ethereum/helpers/network.ts index 9900f8801..33c2c9807 100644 --- a/contracts/ethereum/helpers/network.ts +++ b/contracts/ethereum/helpers/network.ts @@ -1,14 +1,14 @@ import { ethers } from "ethers" export async function waitForNetwork(provider: ethers.providers.JsonRpcProvider) { - let networkReady = false - while (!networkReady) { - try { - await provider.getBlockNumber() - networkReady = true - } catch (error) { - console.log("Waiting for network to start...") - await new Promise(resolve => setTimeout(resolve, 1000)) + let networkReady = false + while (!networkReady) { + try { + await provider.getBlockNumber() + networkReady = true + } catch (error) { + console.log("Waiting for network to start...") + await new Promise(resolve => setTimeout(resolve, 1000)) + } } - } } \ No newline at end of file diff --git a/contracts/ethereum/helpers/oracle.ts b/contracts/ethereum/helpers/oracle.ts index 389b37957..061be9d06 100644 --- a/contracts/ethereum/helpers/oracle.ts +++ b/contracts/ethereum/helpers/oracle.ts @@ -20,290 +20,303 @@ const wethTokenAddress = process.env.WETH_TOKEN_ADDRESS as string if (!wethTokenAddress) throw new Error("No weth token address provided") export async function initiatePoolHandler({ manager, signer }: { manager: CasimirManager, signer: SignerWithAddress }) { - const mockValidators: Validator[] = MOCK_VALIDATORS[signer.address as keyof typeof MOCK_VALIDATORS] - const nonce = await ethers.provider.getTransactionCount(manager.address) - const poolAddress = ethers.utils.getContractAddress({ - from: manager.address, - nonce - }) - const poolWithdrawalCredentials = "0x" + "01" + "0".repeat(22) + poolAddress.split("0x")[1] - const validator = mockValidators.find((validator) => { - return validator.withdrawalCredentials.toLowerCase() === poolWithdrawalCredentials.toLowerCase() - }) - if (!validator) throw new Error(`No validator found for withdrawal credentials ${poolWithdrawalCredentials}`) + const mockValidators: Validator[] = MOCK_VALIDATORS[signer.address as keyof typeof MOCK_VALIDATORS] + const nonce = await ethers.provider.getTransactionCount(manager.address) + const poolAddress = ethers.utils.getContractAddress({ + from: manager.address, + nonce + }) + const poolWithdrawalCredentials = "0x" + "01" + "0".repeat(22) + poolAddress.split("0x")[1] + const validator = mockValidators.find((validator) => { + return validator.withdrawalCredentials.toLowerCase() === poolWithdrawalCredentials.toLowerCase() + }) + if (!validator) throw new Error(`No validator found for withdrawal credentials ${poolWithdrawalCredentials}`) - const { - depositDataRoot, - publicKey, - signature, - withdrawalCredentials, - operatorIds, - shares, - } = validator - - const initiatePool = await manager.connect(signer).initiatePool( - depositDataRoot, - publicKey, - signature, - withdrawalCredentials, - operatorIds, - shares - ) - await initiatePool.wait() + const { + depositDataRoot, + publicKey, + signature, + withdrawalCredentials, + operatorIds, + shares, + } = validator + + const initiatePool = await manager.connect(signer).initiatePool( + depositDataRoot, + publicKey, + signature, + withdrawalCredentials, + operatorIds, + shares + ) + await initiatePool.wait() } export async function activatePoolsHandler( - { manager, views, signer, args }: { manager: CasimirManager, views: CasimirViews, signer: SignerWithAddress, args: Record } + { manager, views, signer, args }: + { manager: CasimirManager, views: CasimirViews, signer: SignerWithAddress, args: Record } ) { - const count = args.count as number - if (!count) throw new Error("No count provided") + const count = args.count as number + if (!count) throw new Error("No count provided") - for (let i = 0; i < count; i++) { - const pendingPoolIds = await manager.getPendingPoolIds() - if (!pendingPoolIds.length) throw new Error("No pending pools") + for (let i = 0; i < count; i++) { + const pendingPoolIds = await manager.getPendingPoolIds() + if (!pendingPoolIds.length) throw new Error("No pending pools") - /** + /** * In production, we check the pending pool status on Beacon before activating * Here, we're just grabbing the next pending pool */ - const pendingPoolIndex = 0 - const poolId = pendingPoolIds[pendingPoolIndex] - const poolConfig = await views.getPoolConfig(poolId) - const operatorIds = poolConfig.operatorIds.map((operatorId) => operatorId.toNumber()) - - const scanner = new Scanner({ - provider: ethers.provider, - ssvNetworkAddress, - ssvViewsAddress - }) + const pendingPoolIndex = 0 + const poolId = pendingPoolIds[pendingPoolIndex] + const poolConfig = await views.getPoolConfig(poolId) + const operatorIds = poolConfig.operatorIds.map((operatorId) => operatorId.toNumber()) + + const scanner = new Scanner({ + provider: ethers.provider, + ssvNetworkAddress, + ssvViewsAddress + }) - const cluster = await scanner.getCluster({ - ownerAddress: manager.address, - operatorIds - }) + const cluster = await scanner.getCluster({ + ownerAddress: manager.address, + operatorIds + }) - const requiredFee = await scanner.getRequiredFee(operatorIds) + const requiredFee = await scanner.getRequiredFee(operatorIds) - const uniswapFactory = new Factory({ - provider: ethers.provider, - uniswapV3FactoryAddress - }) + const uniswapFactory = new Factory({ + provider: ethers.provider, + uniswapV3FactoryAddress + }) - const price = await uniswapFactory.getSwapPrice({ - tokenIn: wethTokenAddress, - tokenOut: ssvTokenAddress, - uniswapFeeTier: 3000 - }) + const price = await uniswapFactory.getSwapPrice({ + tokenIn: wethTokenAddress, + tokenOut: ssvTokenAddress, + uniswapFeeTier: 3000 + }) - const feeAmount = ethers.utils.parseEther((Number(ethers.utils.formatEther(requiredFee)) * price).toPrecision(9)) - const minTokenAmount = ethers.utils.parseEther((Number(ethers.utils.formatEther(requiredFee)) * 0.99).toPrecision(9)) + const feeAmount = ethers.utils.parseEther( + (Number(ethers.utils.formatEther(requiredFee)) * price).toPrecision(9) + ) + const minTokenAmount = ethers.utils.parseEther( + (Number(ethers.utils.formatEther(requiredFee)) * 0.99).toPrecision(9) + ) - const activatePool = await manager.connect(signer).activatePool( - pendingPoolIndex, - cluster, - feeAmount, - minTokenAmount, - false - ) - await activatePool.wait() - } + const activatePool = await manager.connect(signer).activatePool( + pendingPoolIndex, + cluster, + feeAmount, + minTokenAmount, + false + ) + await activatePool.wait() + } } export async function resharePoolHandler( - { manager, views, signer, args }: { manager: CasimirManager, views: CasimirViews, signer: SignerWithAddress, args: Record } + { manager, views, signer, args }: + { manager: CasimirManager, views: CasimirViews, signer: SignerWithAddress, args: Record } ) { - const operatorId = args.operatorId as number - if (!operatorId) throw new Error("No operator id provided") + const operatorId = args.operatorId as number + if (!operatorId) throw new Error("No operator id provided") - const poolIds = [ - ...await manager.getPendingPoolIds(), ...await manager.getStakedPoolIds() - ] - - for (const poolId of poolIds) { - const poolConfig = await views.getPoolConfig(poolId) - const oldOperatorIds = poolConfig.operatorIds.map(id => id.toNumber()) - if (oldOperatorIds.includes(operatorId)) { - const mockReshares: Reshare[] = MOCK_RESHARES[poolId as keyof typeof MOCK_RESHARES] - const poolReshareCount = poolConfig.reshares.toNumber() - if (mockReshares.length && poolReshareCount < 2) { - const reshare = mockReshares.find((reshare) => { - return JSON.stringify(reshare.oldOperatorIds) === JSON.stringify(oldOperatorIds) - }) - if (!reshare) throw new Error(`No reshare found for pool ${poolId} with old operator ids ${oldOperatorIds}`) - - const newOperatorId = reshare.operatorIds.find((id) => !oldOperatorIds.includes(id)) as number - - const scanner = new Scanner({ - provider: ethers.provider, - ssvNetworkAddress, - ssvViewsAddress - }) + const poolIds = [ + ...await manager.getPendingPoolIds(), ...await manager.getStakedPoolIds() + ] + + for (const poolId of poolIds) { + const poolConfig = await views.getPoolConfig(poolId) + const oldOperatorIds = poolConfig.operatorIds.map(id => id.toNumber()) + if (oldOperatorIds.includes(operatorId)) { + const mockReshares: Reshare[] = MOCK_RESHARES[poolId as keyof typeof MOCK_RESHARES] + const poolReshareCount = poolConfig.reshares.toNumber() + if (mockReshares.length && poolReshareCount < 2) { + const reshare = mockReshares.find((reshare) => { + return JSON.stringify(reshare.oldOperatorIds) === JSON.stringify(oldOperatorIds) + }) + if (!reshare) throw new Error(`No reshare found for pool ${poolId} with old operator ids ${oldOperatorIds}`) + + const newOperatorId = reshare.operatorIds.find((id) => !oldOperatorIds.includes(id)) as number + + const scanner = new Scanner({ + provider: ethers.provider, + ssvNetworkAddress, + ssvViewsAddress + }) - const oldCluster = await scanner.getCluster({ - operatorIds: oldOperatorIds, - ownerAddress: manager.address - }) + const oldCluster = await scanner.getCluster({ + operatorIds: oldOperatorIds, + ownerAddress: manager.address + }) - const cluster = await scanner.getCluster({ - operatorIds: reshare.operatorIds, - ownerAddress: manager.address - }) + const cluster = await scanner.getCluster({ + operatorIds: reshare.operatorIds, + ownerAddress: manager.address + }) - const requiredFee = await scanner.getRequiredFee(reshare.operatorIds) + const requiredFee = await scanner.getRequiredFee(reshare.operatorIds) - const uniswapFactory = new Factory({ - provider: ethers.provider, - uniswapV3FactoryAddress - }) + const uniswapFactory = new Factory({ + provider: ethers.provider, + uniswapV3FactoryAddress + }) - const price = await uniswapFactory.getSwapPrice({ - tokenIn: wethTokenAddress, - tokenOut: ssvTokenAddress, - uniswapFeeTier: 3000 - }) + const price = await uniswapFactory.getSwapPrice({ + tokenIn: wethTokenAddress, + tokenOut: ssvTokenAddress, + uniswapFeeTier: 3000 + }) - const unformattedFeeAmount = (Number(ethers.utils.formatEther(requiredFee.sub(oldCluster.balance))) * Number(price)).toPrecision(9) - const feeAmount = ethers.utils.parseEther(unformattedFeeAmount) - const minTokenAmount = ethers.utils.parseEther((Number(ethers.utils.formatEther(requiredFee.sub(oldCluster.balance))) * 0.99).toPrecision(9)) - - const reportReshare = await manager.connect(signer).resharePool( - poolId, - reshare.operatorIds, - newOperatorId, - operatorId, - reshare.shares, - cluster, - oldCluster, - feeAmount, - minTokenAmount, - false - ) - await reportReshare.wait() - } else { - // Exit pool - } + const unformattedFeeAmount = ( + Number(ethers.utils.formatEther(requiredFee.sub(oldCluster.balance))) + * Number(price)).toPrecision(9) + const feeAmount = ethers.utils.parseEther(unformattedFeeAmount) + const minTokenAmount = ethers.utils.parseEther( + (Number(ethers.utils.formatEther(requiredFee.sub(oldCluster.balance))) + * 0.99).toPrecision(9)) + + const reportReshare = await manager.connect(signer).resharePool( + poolId, + reshare.operatorIds, + newOperatorId, + operatorId, + reshare.shares, + cluster, + oldCluster, + feeAmount, + minTokenAmount, + false + ) + await reportReshare.wait() + } else { + // Exit pool + } + } } - } } -export async function depositFunctionsBalanceHandler({ manager, signer }: { manager: CasimirManager, signer: SignerWithAddress }) { - /** +export async function depositFunctionsBalanceHandler({ manager, signer }: + { manager: CasimirManager, signer: SignerWithAddress }) { + /** * In production, we check the functions balance before reporting * We can set processed to true if the manager has enough LINK tokens * Here, we're just depositing double the Chainlink registration minimum */ - const requiredBalance = 5 - - const uniswapFactory = new Factory({ - provider: ethers.provider, - uniswapV3FactoryAddress - }) - - const price = await uniswapFactory.getSwapPrice({ - tokenIn: wethTokenAddress, - tokenOut: linkTokenAddress, - uniswapFeeTier: 3000 - }) - - const feeAmount = ethers.utils.parseEther((requiredBalance * price).toPrecision(9)) - const minTokenAmount = ethers.utils.parseEther((requiredBalance * 0.99).toPrecision(9)) - - const depositFunctionsBalance = await manager.connect(signer).depositFunctionsBalance( - feeAmount, - minTokenAmount, - false - ) - await depositFunctionsBalance.wait() + const requiredBalance = 5 + + const uniswapFactory = new Factory({ + provider: ethers.provider, + uniswapV3FactoryAddress + }) + + const price = await uniswapFactory.getSwapPrice({ + tokenIn: wethTokenAddress, + tokenOut: linkTokenAddress, + uniswapFeeTier: 3000 + }) + + const feeAmount = ethers.utils.parseEther((requiredBalance * price).toPrecision(9)) + const minTokenAmount = ethers.utils.parseEther((requiredBalance * 0.99).toPrecision(9)) + + const depositFunctionsBalance = await manager.connect(signer).depositFunctionsBalance( + feeAmount, + minTokenAmount, + false + ) + await depositFunctionsBalance.wait() } -export async function depositUpkeepBalanceHandler({ manager, signer }: { manager: CasimirManager, signer: SignerWithAddress }) { - /** +export async function depositUpkeepBalanceHandler({ manager, signer }: + { manager: CasimirManager, signer: SignerWithAddress }) { + /** * In production, we check the upkeep balance before reporting * We can set processed to true if the manager has enough LINK tokens * Here, we're just depositing double the Chainlink registration minimum */ - const requiredBalance = 5 - - const uniswapFactory = new Factory({ - provider: ethers.provider, - uniswapV3FactoryAddress - }) - - const price = await uniswapFactory.getSwapPrice({ - tokenIn: wethTokenAddress, - tokenOut: linkTokenAddress, - uniswapFeeTier: 3000 - }) + const requiredBalance = 5 + + const uniswapFactory = new Factory({ + provider: ethers.provider, + uniswapV3FactoryAddress + }) + + const price = await uniswapFactory.getSwapPrice({ + tokenIn: wethTokenAddress, + tokenOut: linkTokenAddress, + uniswapFeeTier: 3000 + }) - const feeAmount = ethers.utils.parseEther((requiredBalance * price).toPrecision(9)) - const minTokenAmount = ethers.utils.parseEther((requiredBalance * 0.99).toPrecision(9)) - - const depositUpkeepBalance = await manager.connect(signer).depositUpkeepBalance( - feeAmount, - minTokenAmount, - false - ) - await depositUpkeepBalance.wait() + const feeAmount = ethers.utils.parseEther((requiredBalance * price).toPrecision(9)) + const minTokenAmount = ethers.utils.parseEther((requiredBalance * 0.99).toPrecision(9)) + + const depositUpkeepBalance = await manager.connect(signer).depositUpkeepBalance( + feeAmount, + minTokenAmount, + false + ) + await depositUpkeepBalance.wait() } export async function reportCompletedExitsHandler( - { manager, views, signer, args }: { manager: CasimirManager, views: CasimirViews, signer: SignerWithAddress, args: Record } + { manager, views, signer, args }: + { manager: CasimirManager, views: CasimirViews, signer: SignerWithAddress, args: Record } ) { - const { count } = args + const { count } = args - /** + /** * In production, we get the completed exit order from Beacon (sorting by withdrawn epoch) * We check all validators using: * const stakedPublicKeys = await views.getStakedPublicKeys(startIndex, endIndex) * Here, we're just grabbing the next exiting pool for each completed exit */ - const stakedPoolIds = await manager.getStakedPoolIds() - let remaining = count - let poolIndex = 0 - while (remaining > 0) { - const poolId = stakedPoolIds[poolIndex] - const poolConfig = await views.getPoolConfig(poolId) - if (poolConfig.status === PoolStatus.EXITING_FORCED || poolConfig.status === PoolStatus.EXITING_REQUESTED) { - remaining-- + const stakedPoolIds = await manager.getStakedPoolIds() + let remaining = count + let poolIndex = 0 + while (remaining > 0) { + const poolId = stakedPoolIds[poolIndex] + const poolConfig = await views.getPoolConfig(poolId) + if (poolConfig.status === PoolStatus.EXITING_FORCED || poolConfig.status === PoolStatus.EXITING_REQUESTED) { + remaining-- - /** + /** * In production, we use the SSV performance data to determine blame * We check all validators using: * const stakedPublicKeys = await views.getStakedPublicKeys(startIndex, endIndex) * Here, we're just hardcoding blame to the first operator if less than 32 ETH */ - const operatorIds = poolConfig.operatorIds.map((operatorId) => operatorId.toNumber()) - - let blamePercents = [0, - 0, - 0, - 0] - if (poolConfig.balance.lt(ethers.utils.parseEther("32"))) { - blamePercents = [100, - 0, - 0, - 0] - } - - const scanner = new Scanner({ - provider: ethers.provider, - ssvNetworkAddress, - ssvViewsAddress - }) - - const cluster = await scanner.getCluster({ - ownerAddress: manager.address, - operatorIds - }) - - const reportCompletedExit = await manager.connect(signer).reportCompletedExit( - poolIndex, - blamePercents, - cluster - ) - await reportCompletedExit.wait() + const operatorIds = poolConfig.operatorIds.map((operatorId) => operatorId.toNumber()) + + let blamePercents = [0, + 0, + 0, + 0] + if (poolConfig.balance.lt(ethers.utils.parseEther("32"))) { + blamePercents = [100, + 0, + 0, + 0] + } + + const scanner = new Scanner({ + provider: ethers.provider, + ssvNetworkAddress, + ssvViewsAddress + }) + + const cluster = await scanner.getCluster({ + ownerAddress: manager.address, + operatorIds + }) + + const reportCompletedExit = await manager.connect(signer).reportCompletedExit( + poolIndex, + blamePercents, + cluster + ) + await reportCompletedExit.wait() + } + poolIndex++ } - poolIndex++ - } } diff --git a/contracts/ethereum/helpers/upkeep.ts b/contracts/ethereum/helpers/upkeep.ts index 6d086b164..b52e33151 100644 --- a/contracts/ethereum/helpers/upkeep.ts +++ b/contracts/ethereum/helpers/upkeep.ts @@ -3,22 +3,22 @@ import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers" import { CasimirUpkeep, FunctionsBillingRegistry } from "../build/@types" export async function runUpkeep({ - donTransmitter, upkeep, + donTransmitter, upkeep, }: { donTransmitter: SignerWithAddress, upkeep: CasimirUpkeep, }) { - let ranUpkeep = false - const checkData = ethers.utils.toUtf8Bytes("0x") - const { ...check } = await upkeep.connect(donTransmitter).checkUpkeep(checkData) - const { upkeepNeeded } = check - if (upkeepNeeded) { - const performData = ethers.utils.toUtf8Bytes("0x") - const performUpkeep = await upkeep.connect(donTransmitter).performUpkeep(performData) - await performUpkeep.wait() - ranUpkeep = true - } - return ranUpkeep + let ranUpkeep = false + const checkData = ethers.utils.toUtf8Bytes("0x") + const { ...check } = await upkeep.connect(donTransmitter).checkUpkeep(checkData) + const { upkeepNeeded } = check + if (upkeepNeeded) { + const performData = ethers.utils.toUtf8Bytes("0x") + const performUpkeep = await upkeep.connect(donTransmitter).performUpkeep(performData) + await performUpkeep.wait() + ranUpkeep = true + } + return ranUpkeep } export interface ReportValues { @@ -31,82 +31,83 @@ export interface ReportValues { } export async function fulfillReport({ - donTransmitter, - upkeep, - functionsBillingRegistry, - values + donTransmitter, + upkeep, + functionsBillingRegistry, + values }: { donTransmitter: SignerWithAddress, upkeep: CasimirUpkeep, functionsBillingRegistry: FunctionsBillingRegistry, values: ReportValues }) { - const { beaconBalance, sweptBalance, activatedDeposits, forcedExits, completedExits, compoundablePoolIds } = values + const { beaconBalance, sweptBalance, activatedDeposits, forcedExits, completedExits, compoundablePoolIds } = values - const requestIds = (await upkeep.queryFilter(upkeep.filters.ReportRequestSent(), -2)).map((event) => event.args.requestId) + const requestIds = + (await upkeep.queryFilter(upkeep.filters.ReportRequestSent(), -2)).map((event) => event.args.requestId) - const balancesRequestId = requestIds[0] + const balancesRequestId = requestIds[0] - const balancesResponse = ethers.utils.defaultAbiCoder.encode( - ["uint128", "uint128"], - [ethers.utils.parseEther(beaconBalance.toString()), ethers.utils.parseEther(sweptBalance.toString())] - ) + const balancesResponse = ethers.utils.defaultAbiCoder.encode( + ["uint128", "uint128"], + [ethers.utils.parseEther(beaconBalance.toString()), ethers.utils.parseEther(sweptBalance.toString())] + ) - await fulfillFunctionsRequest({ - donTransmitter, - functionsBillingRegistry, - requestId: balancesRequestId, - response: balancesResponse - }) + await fulfillFunctionsRequest({ + donTransmitter, + functionsBillingRegistry, + requestId: balancesRequestId, + response: balancesResponse + }) - const detailsRequestId = requestIds[1] - const detailsResponse = ethers.utils.defaultAbiCoder.encode( - ["uint32", - "uint32", - "uint32", - "uint32[5]"], - [activatedDeposits, - forcedExits, - completedExits, - compoundablePoolIds] - ) + const detailsRequestId = requestIds[1] + const detailsResponse = ethers.utils.defaultAbiCoder.encode( + ["uint32", + "uint32", + "uint32", + "uint32[5]"], + [activatedDeposits, + forcedExits, + completedExits, + compoundablePoolIds] + ) - await fulfillFunctionsRequest({ - donTransmitter, - functionsBillingRegistry, - requestId: detailsRequestId, - response: detailsResponse - }) + await fulfillFunctionsRequest({ + donTransmitter, + functionsBillingRegistry, + requestId: detailsRequestId, + response: detailsResponse + }) } export async function fulfillFunctionsRequest({ - donTransmitter, - functionsBillingRegistry, - requestId, - response + donTransmitter, + functionsBillingRegistry, + requestId, + response }: { donTransmitter: SignerWithAddress, functionsBillingRegistry: FunctionsBillingRegistry, requestId: string, response: string }) { - const dummyTransmitter = donTransmitter.address - const dummySigners = Array(31).fill(dummyTransmitter) + const dummyTransmitter = donTransmitter.address + const dummySigners = Array(31).fill(dummyTransmitter) - // const { success, result, resultLog } = await simulateRequest(requestConfig) + // const { success, result, resultLog } = await simulateRequest(requestConfig) - const fulfillAndBill = await functionsBillingRegistry.connect(donTransmitter).fulfillAndBill( - requestId, - response, - "0x", - dummyTransmitter, - dummySigners, - 4, - 100_000, - 500_000, - { - gasLimit: 500_000, - } - ) - await fulfillAndBill.wait() + const fulfillAndBill = await functionsBillingRegistry.connect(donTransmitter).fulfillAndBill( + requestId, + response, + "0x", + dummyTransmitter, + dummySigners, + 4, + 100_000, + 500_000, + { + gasLimit: 500_000, + } + ) + await fulfillAndBill.wait() } diff --git a/contracts/ethereum/scripts/clean.ts b/contracts/ethereum/scripts/clean.ts index 7536ea7ba..f6400f7b3 100644 --- a/contracts/ethereum/scripts/clean.ts +++ b/contracts/ethereum/scripts/clean.ts @@ -1,5 +1,5 @@ import fs from "fs" void function() { - fs.rmSync("build", { recursive: true }) + fs.rmSync("build", { recursive: true }) }() \ No newline at end of file diff --git a/contracts/ethereum/scripts/deploy.ts b/contracts/ethereum/scripts/deploy.ts index 76eb85d92..d9eac5dcc 100644 --- a/contracts/ethereum/scripts/deploy.ts +++ b/contracts/ethereum/scripts/deploy.ts @@ -8,75 +8,76 @@ upgrades.silenceWarnings() * Deploy ethereum contracts */ void async function () { - if (!process.env.DEPOSIT_CONTRACT_ADDRESS) throw new Error("No deposit contract address provided") - if (!process.env.KEEPER_REGISTRAR_ADDRESS) throw new Error("No keeper registrar address provided") - if (!process.env.KEEPER_REGISTRY_ADDRESS) throw new Error("No keeper registry address provided") - if (!process.env.LINK_TOKEN_ADDRESS) throw new Error("No link token address provided") - if (!process.env.LINK_ETH_FEED_ADDRESS) throw new Error("No link eth feed address provided") - if (!process.env.SSV_NETWORK_ADDRESS) throw new Error("No ssv network address provided") - if (!process.env.SSV_TOKEN_ADDRESS) throw new Error("No ssv token address provided") - if (!process.env.SWAP_FACTORY_ADDRESS) throw new Error("No swap factory address provided") - if (!process.env.SWAP_ROUTER_ADDRESS) throw new Error("No swap router address provided") - if (!process.env.WETH_TOKEN_ADDRESS) throw new Error("No weth token address provided") - - const [, daoOracle, - donTransmitter] = await ethers.getSigners() - - const functionsOracleFactoryFactory = await ethers.getContractFactory("FunctionsOracleFactory") - const functionsOracleFactory = await functionsOracleFactoryFactory.deploy() - await functionsOracleFactory.deployed() - console.log(`FunctionsOracleFactory contract deployed to ${functionsOracleFactory.address}`) - - const deployNewOracle = await functionsOracleFactory.deployNewOracle() - const deployNewOracleReceipt = await deployNewOracle.wait() - if (!deployNewOracleReceipt.events) throw new Error("Functions oracle deployment failed") - const functionsOracleAddress = deployNewOracleReceipt.events[1].args?.don as string - const functionsOracle = await ethers.getContractAt("FunctionsOraclePatched", functionsOracleAddress) - const acceptOwnership = await functionsOracle.acceptOwnership() - await acceptOwnership.wait() - console.log(`FunctionsOracle contract deployed to ${functionsOracle.address}`) - - const functionsBillingRegistryArgs = { - linkTokenAddress: process.env.LINK_TOKEN_ADDRESS, - linkEthFeedAddress: process.env.LINK_ETH_FEED_ADDRESS, - functionsOracleAddress: functionsOracle.address - } - const functionsBillingRegistryFactory = await ethers.getContractFactory("FunctionsBillingRegistry") - const functionsBillingRegistry = await functionsBillingRegistryFactory.deploy(...Object.values(functionsBillingRegistryArgs)) - await functionsBillingRegistry.deployed() - console.log(`FunctionsBillingRegistry contract deployed to ${functionsBillingRegistry.address}`) - - const functionsBillingRegistryConfig = { - maxGasLimit: 400_000, - stalenessSeconds: 86_400, - gasAfterPaymentCalculation: + if (!process.env.DEPOSIT_CONTRACT_ADDRESS) throw new Error("No deposit contract address provided") + if (!process.env.KEEPER_REGISTRAR_ADDRESS) throw new Error("No keeper registrar address provided") + if (!process.env.KEEPER_REGISTRY_ADDRESS) throw new Error("No keeper registry address provided") + if (!process.env.LINK_TOKEN_ADDRESS) throw new Error("No link token address provided") + if (!process.env.LINK_ETH_FEED_ADDRESS) throw new Error("No link eth feed address provided") + if (!process.env.SSV_NETWORK_ADDRESS) throw new Error("No ssv network address provided") + if (!process.env.SSV_TOKEN_ADDRESS) throw new Error("No ssv token address provided") + if (!process.env.SWAP_FACTORY_ADDRESS) throw new Error("No swap factory address provided") + if (!process.env.SWAP_ROUTER_ADDRESS) throw new Error("No swap router address provided") + if (!process.env.WETH_TOKEN_ADDRESS) throw new Error("No weth token address provided") + + const [, daoOracle, + donTransmitter] = await ethers.getSigners() + + const functionsOracleFactoryFactory = await ethers.getContractFactory("FunctionsOracleFactory") + const functionsOracleFactory = await functionsOracleFactoryFactory.deploy() + await functionsOracleFactory.deployed() + console.log(`FunctionsOracleFactory contract deployed to ${functionsOracleFactory.address}`) + + const deployNewOracle = await functionsOracleFactory.deployNewOracle() + const deployNewOracleReceipt = await deployNewOracle.wait() + if (!deployNewOracleReceipt.events) throw new Error("Functions oracle deployment failed") + const functionsOracleAddress = deployNewOracleReceipt.events[1].args?.don as string + const functionsOracle = await ethers.getContractAt("FunctionsOraclePatched", functionsOracleAddress) + const acceptOwnership = await functionsOracle.acceptOwnership() + await acceptOwnership.wait() + console.log(`FunctionsOracle contract deployed to ${functionsOracle.address}`) + + const functionsBillingRegistryArgs = { + linkTokenAddress: process.env.LINK_TOKEN_ADDRESS, + linkEthFeedAddress: process.env.LINK_ETH_FEED_ADDRESS, + functionsOracleAddress: functionsOracle.address + } + const functionsBillingRegistryFactory = await ethers.getContractFactory("FunctionsBillingRegistry") + const functionsBillingRegistry = + await functionsBillingRegistryFactory.deploy(...Object.values(functionsBillingRegistryArgs)) + await functionsBillingRegistry.deployed() + console.log(`FunctionsBillingRegistry contract deployed to ${functionsBillingRegistry.address}`) + + const functionsBillingRegistryConfig = { + maxGasLimit: 400_000, + stalenessSeconds: 86_400, + gasAfterPaymentCalculation: 21_000 + 5_000 + 2_100 + 20_000 + 2 * 2_100 - 15_000 + 7_315, - weiPerUnitLink: ethers.BigNumber.from("5000000000000000"), - gasOverhead: 100_000, - requestTimeoutSeconds: 300, - } - - await functionsBillingRegistry.setConfig( - functionsBillingRegistryConfig.maxGasLimit, - functionsBillingRegistryConfig.stalenessSeconds, - functionsBillingRegistryConfig.gasAfterPaymentCalculation, - functionsBillingRegistryConfig.weiPerUnitLink, - functionsBillingRegistryConfig.gasOverhead, - functionsBillingRegistryConfig.requestTimeoutSeconds - ) - - const beaconLibraryFactory = await ethers.getContractFactory("CasimirBeacon") - const beaconLibrary = await beaconLibraryFactory.deploy() - console.log(`CasimirBeacon library deployed at ${beaconLibrary.address}`) - - const managerBeaconFactory = await ethers.getContractFactory("CasimirManager", { - libraries: { - CasimirBeacon: beaconLibrary.address + weiPerUnitLink: ethers.BigNumber.from("5000000000000000"), + gasOverhead: 100_000, + requestTimeoutSeconds: 300, } - }) - const managerBeacon = await upgrades.deployBeacon(managerBeaconFactory, { - constructorArgs: [ - functionsBillingRegistry.address, + + await functionsBillingRegistry.setConfig( + functionsBillingRegistryConfig.maxGasLimit, + functionsBillingRegistryConfig.stalenessSeconds, + functionsBillingRegistryConfig.gasAfterPaymentCalculation, + functionsBillingRegistryConfig.weiPerUnitLink, + functionsBillingRegistryConfig.gasOverhead, + functionsBillingRegistryConfig.requestTimeoutSeconds + ) + + const beaconLibraryFactory = await ethers.getContractFactory("CasimirBeacon") + const beaconLibrary = await beaconLibraryFactory.deploy() + console.log(`CasimirBeacon library deployed at ${beaconLibrary.address}`) + + const managerBeaconFactory = await ethers.getContractFactory("CasimirManager", { + libraries: { + CasimirBeacon: beaconLibrary.address + } + }) + const managerBeacon = await upgrades.deployBeacon(managerBeaconFactory, { + constructorArgs: [ + functionsBillingRegistry.address, process.env.KEEPER_REGISTRAR_ADDRESS as string, process.env.KEEPER_REGISTRY_ADDRESS as string, process.env.LINK_TOKEN_ADDRESS as string, @@ -85,90 +86,90 @@ void async function () { process.env.SWAP_FACTORY_ADDRESS as string, process.env.SWAP_ROUTER_ADDRESS as string, process.env.WETH_TOKEN_ADDRESS as string - ], - unsafeAllow: ["external-library-linking"] - }) - await managerBeacon.deployed() - console.log(`CasimirManager beacon deployed at ${managerBeacon.address}`) - - const poolBeaconFactory = await ethers.getContractFactory("CasimirPool") - const poolBeacon = await upgrades.deployBeacon(poolBeaconFactory, { - constructorArgs: [ + ], + unsafeAllow: ["external-library-linking"] + }) + await managerBeacon.deployed() + console.log(`CasimirManager beacon deployed at ${managerBeacon.address}`) + + const poolBeaconFactory = await ethers.getContractFactory("CasimirPool") + const poolBeacon = await upgrades.deployBeacon(poolBeaconFactory, { + constructorArgs: [ process.env.DEPOSIT_CONTRACT_ADDRESS as string - ] - }) - await poolBeacon.deployed() - console.log(`CasimirPool beacon deployed at ${poolBeacon.address}`) - - const registryBeaconFactory = await ethers.getContractFactory("CasimirRegistry") - const registryBeacon = await upgrades.deployBeacon(registryBeaconFactory, { - constructorArgs: [ + ] + }) + await poolBeacon.deployed() + console.log(`CasimirPool beacon deployed at ${poolBeacon.address}`) + + const registryBeaconFactory = await ethers.getContractFactory("CasimirRegistry") + const registryBeacon = await upgrades.deployBeacon(registryBeaconFactory, { + constructorArgs: [ process.env.SSV_VIEWS_ADDRESS as string - ] - }) - await registryBeacon.deployed() - console.log(`CasimirRegistry beacon deployed at ${registryBeacon.address}`) - - const upkeepBeaconFactory = await ethers.getContractFactory("CasimirUpkeep") - const upkeepBeacon = await upgrades.deployBeacon(upkeepBeaconFactory) - await upkeepBeacon.deployed() - console.log(`CasimirUpkeep beacon deployed at ${upkeepBeacon.address}`) - - const viewsBeaconFactory = await ethers.getContractFactory("CasimirViews") - const viewsBeacon = await upgrades.deployBeacon(viewsBeaconFactory) - await viewsBeacon.deployed() - console.log(`CasimirViews beacon deployed at ${viewsBeacon.address}`) - - const factoryFactory = await ethers.getContractFactory("CasimirFactory", { - libraries: { - CasimirBeacon: beaconLibrary.address + ] + }) + await registryBeacon.deployed() + console.log(`CasimirRegistry beacon deployed at ${registryBeacon.address}`) + + const upkeepBeaconFactory = await ethers.getContractFactory("CasimirUpkeep") + const upkeepBeacon = await upgrades.deployBeacon(upkeepBeaconFactory) + await upkeepBeacon.deployed() + console.log(`CasimirUpkeep beacon deployed at ${upkeepBeacon.address}`) + + const viewsBeaconFactory = await ethers.getContractFactory("CasimirViews") + const viewsBeacon = await upgrades.deployBeacon(viewsBeaconFactory) + await viewsBeacon.deployed() + console.log(`CasimirViews beacon deployed at ${viewsBeacon.address}`) + + const factoryFactory = await ethers.getContractFactory("CasimirFactory", { + libraries: { + CasimirBeacon: beaconLibrary.address + } + }) + const factory = await upgrades.deployProxy(factoryFactory, undefined, { + constructorArgs: [ + managerBeacon.address, + poolBeacon.address, + registryBeacon.address, + upkeepBeacon.address, + viewsBeacon.address + ], + unsafeAllow: ["external-library-linking"] + }) as CasimirFactory + await factory.deployed() + console.log(`CasimirFactory contract deployed at ${factory.address}`) + + const simpleStrategy = { + minCollateral: ethers.utils.parseEther("1.0"), + lockPeriod: 0, + userFee: 5, + compoundStake: true, + eigenStake: false, + liquidStake: false, + privateOperators: false, + verifiedOperators: false } - }) - const factory = await upgrades.deployProxy(factoryFactory, undefined, { - constructorArgs: [ - managerBeacon.address, - poolBeacon.address, - registryBeacon.address, - upkeepBeacon.address, - viewsBeacon.address - ], - unsafeAllow: ["external-library-linking"] - }) as CasimirFactory - await factory.deployed() - console.log(`CasimirFactory contract deployed at ${factory.address}`) - - const simpleStrategy = { - minCollateral: ethers.utils.parseEther("1.0"), - lockPeriod: 0, - userFee: 5, - compoundStake: true, - eigenStake: false, - liquidStake: false, - privateOperators: false, - verifiedOperators: false - } - const deploySimpleManager = await factory.deployManager( - daoOracle.address, - functionsOracle.address, - simpleStrategy - ) - await deploySimpleManager.wait() - const [managerId] = await factory.getManagerIds() - const managerConfig = await factory.getManagerConfig(managerId) - console.log(`Simple CasimirManager contract deployed to ${managerConfig.managerAddress}`) - console.log(`Simple CasimirRegistry contract deployed to ${managerConfig.registryAddress}`) - console.log(`Simple CasimirUpkeep contract deployed to ${managerConfig.upkeepAddress}`) - console.log(`Simple CasimirViews contract deployed to ${managerConfig.viewsAddress}`) - const upkeep = await ethers.getContractAt("CasimirUpkeep", managerConfig.upkeepAddress) as CasimirUpkeep + const deploySimpleManager = await factory.deployManager( + daoOracle.address, + functionsOracle.address, + simpleStrategy + ) + await deploySimpleManager.wait() + const [managerId] = await factory.getManagerIds() + const managerConfig = await factory.getManagerConfig(managerId) + console.log(`Simple CasimirManager contract deployed to ${managerConfig.managerAddress}`) + console.log(`Simple CasimirRegistry contract deployed to ${managerConfig.registryAddress}`) + console.log(`Simple CasimirUpkeep contract deployed to ${managerConfig.upkeepAddress}`) + console.log(`Simple CasimirViews contract deployed to ${managerConfig.viewsAddress}`) + const upkeep = await ethers.getContractAt("CasimirUpkeep", managerConfig.upkeepAddress) as CasimirUpkeep - requestConfig.args[1] = managerConfig.viewsAddress - const fulfillGasLimit = 300000 - const setRequest = await upkeep.setFunctionsRequest(requestConfig.source, requestConfig.args, fulfillGasLimit) - await setRequest.wait() - await upkeep.setFunctionsOracle(functionsOracle.address) - await functionsBillingRegistry.setAuthorizedSenders([functionsOracle.address, donTransmitter.address]) - await functionsOracle.setAuthorizedSenders([donTransmitter.address, - managerConfig.managerAddress, - managerConfig.upkeepAddress]) - await functionsOracle.setRegistry(functionsBillingRegistry.address) + requestConfig.args[1] = managerConfig.viewsAddress + const fulfillGasLimit = 300000 + const setRequest = await upkeep.setFunctionsRequest(requestConfig.source, requestConfig.args, fulfillGasLimit) + await setRequest.wait() + await upkeep.setFunctionsOracle(functionsOracle.address) + await functionsBillingRegistry.setAuthorizedSenders([functionsOracle.address, donTransmitter.address]) + await functionsOracle.setAuthorizedSenders([donTransmitter.address, + managerConfig.managerAddress, + managerConfig.upkeepAddress]) + await functionsOracle.setRegistry(functionsBillingRegistry.address) }() \ No newline at end of file diff --git a/contracts/ethereum/scripts/dev.ts b/contracts/ethereum/scripts/dev.ts index 004a091ac..af114ce08 100644 --- a/contracts/ethereum/scripts/dev.ts +++ b/contracts/ethereum/scripts/dev.ts @@ -17,247 +17,256 @@ import { fulfillReport, runUpkeep } from "../helpers/upkeep" * - SIMULATE_REWARDS: true | false */ async function dev() { - if (!process.env.FACTORY_ADDRESS) throw new Error("No factory address provided") - if (!process.env.MANAGER_BEACON_ADDRESS) throw new Error("No manager beacon address provided") - if (!process.env.POOL_BEACON_ADDRESS) throw new Error("No pool beacon address provided") - if (!process.env.REGISTRY_BEACON_ADDRESS) throw new Error("No registry beacon address provided") - if (!process.env.UPKEEP_BEACON_ADDRESS) throw new Error("No upkeep beacon address provided") - if (!process.env.VIEWS_BEACON_ADDRESS) throw new Error("No views beacon address provided") - if (!process.env.BEACON_LIBRARY_ADDRESS) throw new Error("No beacon library address provided") - if (!process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS) throw new Error("No functions billing registry address provided") - if (!process.env.FUNCTIONS_ORACLE_ADDRESS) throw new Error("No functions oracle address provided") - if (!process.env.DEPOSIT_CONTRACT_ADDRESS) throw new Error("No deposit contract address provided") - if (!process.env.KEEPER_REGISTRAR_ADDRESS) throw new Error("No keeper registrar address provided") - if (!process.env.KEEPER_REGISTRY_ADDRESS) throw new Error("No keeper registry address provided") - if (!process.env.LINK_TOKEN_ADDRESS) throw new Error("No link token address provided") - if (!process.env.LINK_ETH_FEED_ADDRESS) throw new Error("No link eth feed address provided") - if (!process.env.SSV_NETWORK_ADDRESS) throw new Error("No ssv network address provided") - if (!process.env.SSV_TOKEN_ADDRESS) throw new Error("No ssv token address provided") - if (!process.env.SWAP_FACTORY_ADDRESS) throw new Error("No swap factory address provided") - if (!process.env.SWAP_ROUTER_ADDRESS) throw new Error("No swap router address provided") - if (!process.env.WETH_TOKEN_ADDRESS) throw new Error("No weth token address provided") + if (!process.env.FACTORY_ADDRESS) throw new Error("No factory address provided") + if (!process.env.MANAGER_BEACON_ADDRESS) throw new Error("No manager beacon address provided") + if (!process.env.POOL_BEACON_ADDRESS) throw new Error("No pool beacon address provided") + if (!process.env.REGISTRY_BEACON_ADDRESS) throw new Error("No registry beacon address provided") + if (!process.env.UPKEEP_BEACON_ADDRESS) throw new Error("No upkeep beacon address provided") + if (!process.env.VIEWS_BEACON_ADDRESS) throw new Error("No views beacon address provided") + if (!process.env.BEACON_LIBRARY_ADDRESS) throw new Error("No beacon library address provided") + if (!process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS) throw new Error("No functions billing registry address provided") + if (!process.env.FUNCTIONS_ORACLE_ADDRESS) throw new Error("No functions oracle address provided") + if (!process.env.DEPOSIT_CONTRACT_ADDRESS) throw new Error("No deposit contract address provided") + if (!process.env.KEEPER_REGISTRAR_ADDRESS) throw new Error("No keeper registrar address provided") + if (!process.env.KEEPER_REGISTRY_ADDRESS) throw new Error("No keeper registry address provided") + if (!process.env.LINK_TOKEN_ADDRESS) throw new Error("No link token address provided") + if (!process.env.LINK_ETH_FEED_ADDRESS) throw new Error("No link eth feed address provided") + if (!process.env.SSV_NETWORK_ADDRESS) throw new Error("No ssv network address provided") + if (!process.env.SSV_TOKEN_ADDRESS) throw new Error("No ssv token address provided") + if (!process.env.SWAP_FACTORY_ADDRESS) throw new Error("No swap factory address provided") + if (!process.env.SWAP_ROUTER_ADDRESS) throw new Error("No swap router address provided") + if (!process.env.WETH_TOKEN_ADDRESS) throw new Error("No weth token address provided") - await waitForNetwork(ethers.provider) + await waitForNetwork(ethers.provider) - const [owner, - daoOracle, - donTransmitter] = await ethers.getSigners() + const [owner, + daoOracle, + donTransmitter] = await ethers.getSigners() - const functionsOracle = await ethers.getContractAt("FunctionsOracle", process.env.FUNCTIONS_ORACLE_ADDRESS) as FunctionsOracle - const functionsBillingRegistry = await ethers.getContractAt("FunctionsBillingRegistry", process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS) as FunctionsBillingRegistry + const functionsOracle = await ethers.getContractAt("FunctionsOracle", process.env.FUNCTIONS_ORACLE_ADDRESS) as FunctionsOracle + const functionsBillingRegistry = await ethers.getContractAt("FunctionsBillingRegistry", process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS) as FunctionsBillingRegistry - /** + /** * Deploy in-development contract upgrades * Helpful also for adding hardhat/console to debug existing methods */ - if (process.env.SIMULATE_UPGRADES === "true") { - upgrades.silenceWarnings() + if (process.env.SIMULATE_UPGRADES === "true") { + upgrades.silenceWarnings() - const factoryProxyFactory = await ethers.getContractFactory("CasimirFactoryDev", { - libraries: { - CasimirBeacon: process.env.BEACON_LIBRARY_ADDRESS - } - }) - const factoryProxy = await upgrades.upgradeProxy(process.env.FACTORY_ADDRESS, factoryProxyFactory, { - constructorArgs: [ - process.env.MANAGER_BEACON_ADDRESS, - process.env.POOL_BEACON_ADDRESS, - process.env.REGISTRY_BEACON_ADDRESS, - process.env.UPKEEP_BEACON_ADDRESS, - process.env.VIEWS_BEACON_ADDRESS - ], - unsafeAllow: ["external-library-linking"] - }) - await factoryProxy.deployed() + const factoryProxyFactory = await ethers.getContractFactory("CasimirFactoryDev", { + libraries: { + CasimirBeacon: process.env.BEACON_LIBRARY_ADDRESS + } + }) + const factoryProxy = await upgrades.upgradeProxy(process.env.FACTORY_ADDRESS, factoryProxyFactory, { + constructorArgs: [ + process.env.MANAGER_BEACON_ADDRESS, + process.env.POOL_BEACON_ADDRESS, + process.env.REGISTRY_BEACON_ADDRESS, + process.env.UPKEEP_BEACON_ADDRESS, + process.env.VIEWS_BEACON_ADDRESS + ], + unsafeAllow: ["external-library-linking"] + }) + await factoryProxy.deployed() - const managerBeaconFactory = await ethers.getContractFactory("CasimirManagerDev", { - libraries: { - CasimirBeacon: process.env.BEACON_LIBRARY_ADDRESS - } - }) - const managerBeacon = await upgrades.upgradeBeacon(process.env.MANAGER_BEACON_ADDRESS, managerBeaconFactory, { - constructorArgs: [ - process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS, - process.env.KEEPER_REGISTRAR_ADDRESS, - process.env.KEEPER_REGISTRY_ADDRESS, - process.env.LINK_TOKEN_ADDRESS, - process.env.SSV_NETWORK_ADDRESS, - process.env.SSV_TOKEN_ADDRESS, - process.env.SWAP_FACTORY_ADDRESS, - process.env.SWAP_ROUTER_ADDRESS, - process.env.WETH_TOKEN_ADDRESS - ], - unsafeAllow: ["external-library-linking"] - }) - await managerBeacon.deployed() + const managerBeaconFactory = await ethers.getContractFactory("CasimirManagerDev", { + libraries: { + CasimirBeacon: process.env.BEACON_LIBRARY_ADDRESS + } + }) + const managerBeacon = await upgrades.upgradeBeacon(process.env.MANAGER_BEACON_ADDRESS, managerBeaconFactory, { + constructorArgs: [ + process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS, + process.env.KEEPER_REGISTRAR_ADDRESS, + process.env.KEEPER_REGISTRY_ADDRESS, + process.env.LINK_TOKEN_ADDRESS, + process.env.SSV_NETWORK_ADDRESS, + process.env.SSV_TOKEN_ADDRESS, + process.env.SWAP_FACTORY_ADDRESS, + process.env.SWAP_ROUTER_ADDRESS, + process.env.WETH_TOKEN_ADDRESS + ], + unsafeAllow: ["external-library-linking"] + }) + await managerBeacon.deployed() - const registryBeaconFactory = await ethers.getContractFactory("CasimirRegistryDev") - const registryBeacon = await upgrades.upgradeBeacon(process.env.REGISTRY_BEACON_ADDRESS, registryBeaconFactory, { - constructorArgs: [ - process.env.SSV_VIEWS_ADDRESS - ] - }) - await registryBeacon.deployed() + const registryBeaconFactory = await ethers.getContractFactory("CasimirRegistryDev") + const registryBeacon = await upgrades + .upgradeBeacon(process.env.REGISTRY_BEACON_ADDRESS, registryBeaconFactory, { + constructorArgs: [ + process.env.SSV_VIEWS_ADDRESS + ] + }) + await registryBeacon.deployed() - const upkeepBeaconFactory = await ethers.getContractFactory("CasimirUpkeepDev") - const upkeepBeacon = await upgrades.upgradeBeacon(process.env.UPKEEP_BEACON_ADDRESS, upkeepBeaconFactory) - await upkeepBeacon.deployed() + const upkeepBeaconFactory = await ethers.getContractFactory("CasimirUpkeepDev") + const upkeepBeacon = await upgrades.upgradeBeacon(process.env.UPKEEP_BEACON_ADDRESS, upkeepBeaconFactory) + await upkeepBeacon.deployed() - const viewsBeaconFactory = await ethers.getContractFactory("CasimirViewsDev") - const viewsBeacon = await upgrades.upgradeBeacon(process.env.VIEWS_BEACON_ADDRESS, viewsBeaconFactory) - await viewsBeacon.deployed() - } - const factory = await ethers.getContractAt("CasimirFactoryDev", process.env.FACTORY_ADDRESS) as CasimirFactoryDev - console.log(`Casimir factory ${factory.address}`) + const viewsBeaconFactory = await ethers.getContractFactory("CasimirViewsDev") + const viewsBeacon = await upgrades.upgradeBeacon(process.env.VIEWS_BEACON_ADDRESS, viewsBeaconFactory) + await viewsBeacon.deployed() + } + const factory = await ethers.getContractAt("CasimirFactoryDev", process.env.FACTORY_ADDRESS) as CasimirFactoryDev + console.log(`Casimir factory ${factory.address}`) - const [managerId] = await factory.getManagerIds() - const managerConfig = await factory.getManagerConfig(managerId) + const [managerId] = await factory.getManagerIds() + const managerConfig = await factory.getManagerConfig(managerId) - const manager = await ethers.getContractAt("CasimirManagerDev", managerConfig.managerAddress) as CasimirManagerDev - console.log(`Casimir simple manager ${manager.address}`) + const manager = await ethers.getContractAt("CasimirManagerDev", managerConfig.managerAddress) as CasimirManagerDev + console.log(`Casimir simple manager ${manager.address}`) - const registry = await ethers.getContractAt("CasimirRegistryDev", managerConfig.registryAddress) as CasimirRegistryDev - console.log(`Casimir simple registry ${registry.address}`) + const registry = await ethers.getContractAt("CasimirRegistryDev", managerConfig.registryAddress) as CasimirRegistryDev + console.log(`Casimir simple registry ${registry.address}`) - const upkeep = await ethers.getContractAt("CasimirUpkeepDev", managerConfig.upkeepAddress) as CasimirUpkeepDev - console.log(`Casimir simple upkeep ${upkeep.address}`) + const upkeep = await ethers.getContractAt("CasimirUpkeepDev", managerConfig.upkeepAddress) as CasimirUpkeepDev + console.log(`Casimir simple upkeep ${upkeep.address}`) - const views = await ethers.getContractAt("CasimirViewsDev", managerConfig.viewsAddress) as CasimirViewsDev - console.log(`Casimir simple views ${views.address}`) + const views = await ethers.getContractAt("CasimirViewsDev", managerConfig.viewsAddress) as CasimirViewsDev + console.log(`Casimir simple views ${views.address}`) - /** + /** * Deploy a second operator groups with Casimir Eigen stake enabled * Note, this operator group is not functional it only deployed for testing purposes */ - if (process.env.SIMULATE_EIGEN === "true") { - const deployEigenManager = await factory.connect(owner).deployManager( - daoOracle.address, - functionsOracle.address, - { - minCollateral: ethers.utils.parseEther("1.0"), - lockPeriod: ethers.BigNumber.from("0"), - userFee: ethers.BigNumber.from("5"), - compoundStake: true, - eigenStake: true, - liquidStake: false, - privateOperators: false, - verifiedOperators: false - } - ) - await deployEigenManager.wait() - const [, eigenManagerId] = await factory.getManagerIds() - const eigenManagerConfig = await factory.getManagerConfig(eigenManagerId) + if (process.env.SIMULATE_EIGEN === "true") { + const deployEigenManager = await factory.connect(owner).deployManager( + daoOracle.address, + functionsOracle.address, + { + minCollateral: ethers.utils.parseEther("1.0"), + lockPeriod: ethers.BigNumber.from("0"), + userFee: ethers.BigNumber.from("5"), + compoundStake: true, + eigenStake: true, + liquidStake: false, + privateOperators: false, + verifiedOperators: false + } + ) + await deployEigenManager.wait() + const [, eigenManagerId] = await factory.getManagerIds() + const eigenManagerConfig = await factory.getManagerConfig(eigenManagerId) - const eigenManager = await ethers.getContractAt("CasimirManagerDev", eigenManagerConfig.managerAddress) as CasimirManagerDev - console.log(`Casimir Eigen manager ${eigenManager.address}`) - const eigenRegistry = await ethers.getContractAt("CasimirRegistryDev", eigenManagerConfig.registryAddress) as CasimirRegistryDev - console.log(`Casimir Eigen registry ${eigenRegistry.address}`) - const eigenUpkeep = await ethers.getContractAt("CasimirUpkeepDev", eigenManagerConfig.upkeepAddress) as CasimirUpkeepDev - console.log(`Casimir Eigen upkeep ${eigenUpkeep.address}`) - const eigenViews = await ethers.getContractAt("CasimirViewsDev", eigenManagerConfig.viewsAddress) as CasimirViewsDev - console.log(`Casimir Eigen views ${eigenViews.address}`) + const eigenManager = await ethers.getContractAt("CasimirManagerDev", eigenManagerConfig.managerAddress) as CasimirManagerDev + console.log(`Casimir Eigen manager ${eigenManager.address}`) + const eigenRegistry = await ethers.getContractAt("CasimirRegistryDev", eigenManagerConfig.registryAddress) as CasimirRegistryDev + console.log(`Casimir Eigen registry ${eigenRegistry.address}`) + const eigenUpkeep = await ethers.getContractAt("CasimirUpkeepDev", eigenManagerConfig.upkeepAddress) as CasimirUpkeepDev + console.log(`Casimir Eigen upkeep ${eigenUpkeep.address}`) + const eigenViews = await ethers.getContractAt("CasimirViewsDev", eigenManagerConfig.viewsAddress) as CasimirViewsDev + console.log(`Casimir Eigen views ${eigenViews.address}`) - requestConfig.args[1] = eigenViews.address - await (await eigenUpkeep.connect(owner).setFunctionsRequest( - requestConfig.source, requestConfig.args, 300000 - )).wait() + requestConfig.args[1] = eigenViews.address + await (await eigenUpkeep.connect(owner).setFunctionsRequest( + requestConfig.source, requestConfig.args, 300000 + )).wait() - const functionsOracleSenders = await functionsOracle.getAuthorizedSenders() - const newFunctionsOracleSenders = [...functionsOracleSenders, - eigenManager.address, - eigenUpkeep.address] - await functionsOracle.connect(owner).setAuthorizedSenders(newFunctionsOracleSenders) - } + const functionsOracleSenders = await functionsOracle.getAuthorizedSenders() + const newFunctionsOracleSenders = [...functionsOracleSenders, + eigenManager.address, + eigenUpkeep.address] + await functionsOracle.connect(owner).setAuthorizedSenders(newFunctionsOracleSenders) + } - /** + /** * Simulate oracle reporting on a higher than average rate * Exit balances are swept as needed */ - if (process.env.SIMULATE_REWARDS === "true") { - const blocksPerReport = 10 - const rewardPerValidator = 0.105 - let lastReportBlock = await ethers.provider.getBlockNumber() - let lastStakedPoolIds: number[] = [] - ethers.provider.on("block", async (block) => { - if (block - blocksPerReport >= lastReportBlock) { - await time.increase(time.duration.days(1)) - console.log("⌛️ Report period complete") - lastReportBlock = await ethers.provider.getBlockNumber() - await runUpkeep({ donTransmitter, upkeep }) - const pendingPoolIds = await manager.getPendingPoolIds() - const stakedPoolIds = await manager.getStakedPoolIds() - if (pendingPoolIds.length + stakedPoolIds.length) { - console.log("🧾 Submitting report") - const activatedPoolCount = pendingPoolIds.length - const activatedBalance = activatedPoolCount * 32 - const sweptRewardBalance = rewardPerValidator * lastStakedPoolIds.length - const exitingPoolCount = await manager.requestedExits() - const sweptExitedBalance = exitingPoolCount.toNumber() * 32 - const rewardBalance = rewardPerValidator * stakedPoolIds.length - const latestBeaconBalance = await manager.latestBeaconBalance() - const formattedBeaconBalance = ethers.utils.formatEther(latestBeaconBalance) - const nextBeaconBalance = round( - parseFloat(formattedBeaconBalance) + activatedBalance + rewardBalance - sweptRewardBalance - sweptExitedBalance, - 10 - ) - const nextActivatedDeposits = (await manager.getPendingPoolIds()).length - for (const poolId of lastStakedPoolIds) { - const poolAddress = await manager.getPoolAddress(poolId) - const currentBalance = await ethers.provider.getBalance(poolAddress) - const nextBalance = currentBalance.add(ethers.utils.parseEther(rewardPerValidator.toString())) - await setBalance(poolAddress, nextBalance) - } - const startIndex = ethers.BigNumber.from(0) - const endIndex = ethers.BigNumber.from(stakedPoolIds.length) - const compoundablePoolIds = await views.getCompoundablePoolIds(startIndex, endIndex) - const reportValues = { - beaconBalance: nextBeaconBalance, - sweptBalance: sweptRewardBalance + sweptExitedBalance, - activatedDeposits: nextActivatedDeposits, - forcedExits: 0, - completedExits: exitingPoolCount.toNumber(), - compoundablePoolIds - } - console.log("🧾 Report values", reportValues) - await fulfillReport({ - donTransmitter, - upkeep, - functionsBillingRegistry, - values: reportValues - }) - if (activatedPoolCount) { - await activatePoolsHandler({ manager, views, signer: daoOracle, args: { count: activatedPoolCount } }) - } - let remaining = exitingPoolCount.toNumber() - if (remaining) { - for (const poolId of stakedPoolIds) { - if (remaining === 0) break - const poolConfig = await views.getPoolConfig(poolId) - if (poolConfig.status === PoolStatus.EXITING_FORCED || poolConfig.status === PoolStatus.EXITING_REQUESTED) { - remaining-- - const poolAddress = await manager.getPoolAddress(poolId) - const currentBalance = await ethers.provider.getBalance(poolAddress) - const poolSweptExitedBalance = sweptExitedBalance / exitingPoolCount.toNumber() - const nextBalance = currentBalance.add(ethers.utils.parseEther(poolSweptExitedBalance.toString())) - await setBalance(poolAddress, nextBalance) - } - } - let finalizableCompletedExits = await manager.finalizableCompletedExits() - while (finalizableCompletedExits.toNumber() !== exitingPoolCount.toNumber()) { - finalizableCompletedExits = await manager.finalizableCompletedExits() + if (process.env.SIMULATE_REWARDS === "true") { + const blocksPerReport = 10 + const rewardPerValidator = 0.105 + let lastReportBlock = await ethers.provider.getBlockNumber() + let lastStakedPoolIds: number[] = [] + ethers.provider.on("block", async (block) => { + if (block - blocksPerReport >= lastReportBlock) { + await time.increase(time.duration.days(1)) + console.log("⌛️ Report period complete") + lastReportBlock = await ethers.provider.getBlockNumber() + await runUpkeep({ donTransmitter, upkeep }) + const pendingPoolIds = await manager.getPendingPoolIds() + const stakedPoolIds = await manager.getStakedPoolIds() + if (pendingPoolIds.length + stakedPoolIds.length) { + console.log("🧾 Submitting report") + const activatedPoolCount = pendingPoolIds.length + const activatedBalance = activatedPoolCount * 32 + const sweptRewardBalance = rewardPerValidator * lastStakedPoolIds.length + const exitingPoolCount = await manager.requestedExits() + const sweptExitedBalance = exitingPoolCount.toNumber() * 32 + const rewardBalance = rewardPerValidator * stakedPoolIds.length + const latestBeaconBalance = await manager.latestBeaconBalance() + const formattedBeaconBalance = ethers.utils.formatEther(latestBeaconBalance) + const nextBeaconBalance = round( + parseFloat(formattedBeaconBalance) + + activatedBalance + + rewardBalance + - sweptRewardBalance + - sweptExitedBalance, + 10 + ) + const nextActivatedDeposits = (await manager.getPendingPoolIds()).length + for (const poolId of lastStakedPoolIds) { + const poolAddress = await manager.getPoolAddress(poolId) + const currentBalance = await ethers.provider.getBalance(poolAddress) + const nextBalance = currentBalance.add(ethers.utils.parseEther(rewardPerValidator.toString())) + await setBalance(poolAddress, nextBalance) + } + const startIndex = ethers.BigNumber.from(0) + const endIndex = ethers.BigNumber.from(stakedPoolIds.length) + const compoundablePoolIds = await views.getCompoundablePoolIds(startIndex, endIndex) + const reportValues = { + beaconBalance: nextBeaconBalance, + sweptBalance: sweptRewardBalance + sweptExitedBalance, + activatedDeposits: nextActivatedDeposits, + forcedExits: 0, + completedExits: exitingPoolCount.toNumber(), + compoundablePoolIds + } + console.log("🧾 Report values", reportValues) + await fulfillReport({ + donTransmitter, + upkeep, + functionsBillingRegistry, + values: reportValues + }) + if (activatedPoolCount) { + await activatePoolsHandler( + { manager, views, signer: daoOracle, args: { count: activatedPoolCount } } + ) + } + let remaining = exitingPoolCount.toNumber() + if (remaining) { + for (const poolId of stakedPoolIds) { + if (remaining === 0) break + const poolConfig = await views.getPoolConfig(poolId) + if (poolConfig.status === PoolStatus.EXITING_FORCED + || poolConfig.status === PoolStatus.EXITING_REQUESTED) { + remaining-- + const poolAddress = await manager.getPoolAddress(poolId) + const currentBalance = await ethers.provider.getBalance(poolAddress) + const poolSweptExitedBalance = sweptExitedBalance / exitingPoolCount.toNumber() + const nextBalance = currentBalance + .add(ethers.utils.parseEther(poolSweptExitedBalance.toString())) + await setBalance(poolAddress, nextBalance) + } + } + let finalizableCompletedExits = await manager.finalizableCompletedExits() + while (finalizableCompletedExits.toNumber() !== exitingPoolCount.toNumber()) { + finalizableCompletedExits = await manager.finalizableCompletedExits() + } + } + await runUpkeep({ donTransmitter, upkeep }) + } + lastStakedPoolIds = stakedPoolIds } - } - await runUpkeep({ donTransmitter, upkeep }) - } - lastStakedPoolIds = stakedPoolIds - } - }) - } + }) + } - run("npm run dev --workspace @casimir/oracle") + run("npm run dev --workspace @casimir/oracle") } dev().catch(error => { - console.error(error) - process.exit(1) + console.error(error) + process.exit(1) }) diff --git a/contracts/ethereum/scripts/rebalance-bug-1.ts b/contracts/ethereum/scripts/rebalance-bug-1.ts index b97cdd95d..42ae03861 100644 --- a/contracts/ethereum/scripts/rebalance-bug-1.ts +++ b/contracts/ethereum/scripts/rebalance-bug-1.ts @@ -13,39 +13,40 @@ import { ETHEREUM_CONTRACTS, ETHEREUM_RPC_URL } from "@casimir/env" void async function() { - const doNotRun = true - if (doNotRun) { - throw new Error("Do not run this script. It is archived for internal documentation only.") - } - - process.env.ETHEREUM_RPC_URL = ETHEREUM_RPC_URL["TESTNET"] - process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS = ETHEREUM_CONTRACTS["TESTNET"].FUNCTIONS_BILLING_REGISTRY_ADDRESS - process.env.FUNCTIONS_ORACLE_ADDRESS = ETHEREUM_CONTRACTS["TESTNET"].FUNCTIONS_ORACLE_ADDRESS - const [owner] = await ethers.getSigners() - const provider = new ethers.providers.JsonRpcProvider(ETHEREUM_RPC_URL["TESTNET"]) - const factory = new ethers.Contract(ETHEREUM_CONTRACTS["TESTNET"].FACTORY_ADDRESS, ICasimirFactoryAbi, provider) as CasimirFactory - const [managerId] = await factory.getManagerIds() - const managerConfig = await factory.getManagerConfig(managerId) - const manager = new ethers.Contract(managerConfig.managerAddress, ICasimirManagerAbi, provider) as CasimirManager - - const wrongStakeRatioSumChange1 = ethers.utils.parseEther("-409.082737011318350061") - const undoStakeRatioSumChange1 = await manager.connect(owner).unbalanceStake(wrongStakeRatioSumChange1) - await undoStakeRatioSumChange1.wait() - - const correctStakeRatioSumChange1 = ethers.utils.parseEther("0.035209244538409142") - const redoStakeRatioSumChange1 = await manager.connect(owner).unbalanceStake(correctStakeRatioSumChange1) - await redoStakeRatioSumChange1.wait() - - const wrongStakeRatioSumChange2 = ethers.utils.parseEther("617.841429400917953927") - const undoStakeRatioSumChange2 = await manager.connect(owner).unbalanceStake(wrongStakeRatioSumChange2) - await undoStakeRatioSumChange2.wait() - - const correctStakeRatioSumChange2 = ethers.utils.parseEther("-0.000323535550800035") - const redoStakeRatioSumChange2 = await manager.connect(owner).unbalanceStake(correctStakeRatioSumChange2) - await redoStakeRatioSumChange2.wait() - - const latestBeaconBalanceAfterFees = ethers.utils.parseEther("63.998872616") - const setLatestBeaconBalanceAfterFees = await manager.connect(owner).setLatestBeaconBalanceAfterFees(latestBeaconBalanceAfterFees) - await setLatestBeaconBalanceAfterFees.wait() + const doNotRun = true + if (doNotRun) { + throw new Error("Do not run this script. It is archived for internal documentation only.") + } + + process.env.ETHEREUM_RPC_URL = ETHEREUM_RPC_URL["TESTNET"] + process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS = ETHEREUM_CONTRACTS["TESTNET"].FUNCTIONS_BILLING_REGISTRY_ADDRESS + process.env.FUNCTIONS_ORACLE_ADDRESS = ETHEREUM_CONTRACTS["TESTNET"].FUNCTIONS_ORACLE_ADDRESS + const [owner] = await ethers.getSigners() + const provider = new ethers.providers.JsonRpcProvider(ETHEREUM_RPC_URL["TESTNET"]) + const factory = new ethers.Contract(ETHEREUM_CONTRACTS["TESTNET"].FACTORY_ADDRESS, ICasimirFactoryAbi, provider) as CasimirFactory + const [managerId] = await factory.getManagerIds() + const managerConfig = await factory.getManagerConfig(managerId) + const manager = new ethers.Contract(managerConfig.managerAddress, ICasimirManagerAbi, provider) as CasimirManager + + const wrongStakeRatioSumChange1 = ethers.utils.parseEther("-409.082737011318350061") + const undoStakeRatioSumChange1 = await manager.connect(owner).unbalanceStake(wrongStakeRatioSumChange1) + await undoStakeRatioSumChange1.wait() + + const correctStakeRatioSumChange1 = ethers.utils.parseEther("0.035209244538409142") + const redoStakeRatioSumChange1 = await manager.connect(owner).unbalanceStake(correctStakeRatioSumChange1) + await redoStakeRatioSumChange1.wait() + + const wrongStakeRatioSumChange2 = ethers.utils.parseEther("617.841429400917953927") + const undoStakeRatioSumChange2 = await manager.connect(owner).unbalanceStake(wrongStakeRatioSumChange2) + await undoStakeRatioSumChange2.wait() + + const correctStakeRatioSumChange2 = ethers.utils.parseEther("-0.000323535550800035") + const redoStakeRatioSumChange2 = await manager.connect(owner).unbalanceStake(correctStakeRatioSumChange2) + await redoStakeRatioSumChange2.wait() + + const latestBeaconBalanceAfterFees = ethers.utils.parseEther("63.998872616") + const setLatestBeaconBalanceAfterFees = + await manager.connect(owner).setLatestBeaconBalanceAfterFees(latestBeaconBalanceAfterFees) + await setLatestBeaconBalanceAfterFees.wait() }() \ No newline at end of file diff --git a/contracts/ethereum/scripts/report.ts b/contracts/ethereum/scripts/report.ts index 1880287f0..1106c0c74 100644 --- a/contracts/ethereum/scripts/report.ts +++ b/contracts/ethereum/scripts/report.ts @@ -5,41 +5,41 @@ import { runUpkeep } from "../helpers/upkeep" import e from "cors" void async function() { - if (!process.env.FACTORY_ADDRESS) throw new Error("No factory address provided") + if (!process.env.FACTORY_ADDRESS) throw new Error("No factory address provided") - await waitForNetwork(ethers.provider) + await waitForNetwork(ethers.provider) - const [owner, , donTransmitter] = await ethers.getSigners() - const factory = await ethers.getContractAt("CasimirFactory", process.env.FACTORY_ADDRESS) as CasimirFactory - const [managerId] = await factory.getManagerIds() - const managerConfig = await factory.getManagerConfig(managerId) - const manager = await ethers.getContractAt("CasimirManager", managerConfig.managerAddress) as CasimirManager - const registry = await ethers.getContractAt("CasimirRegistry", managerConfig.registryAddress) as CasimirRegistry - const upkeep = await ethers.getContractAt("CasimirUpkeep", managerConfig.upkeepAddress) as CasimirUpkeep - const views = await ethers.getContractAt("CasimirViews", managerConfig.viewsAddress) as CasimirViews + const [owner, , donTransmitter] = await ethers.getSigners() + const factory = await ethers.getContractAt("CasimirFactory", process.env.FACTORY_ADDRESS) as CasimirFactory + const [managerId] = await factory.getManagerIds() + const managerConfig = await factory.getManagerConfig(managerId) + const manager = await ethers.getContractAt("CasimirManager", managerConfig.managerAddress) as CasimirManager + const registry = await ethers.getContractAt("CasimirRegistry", managerConfig.registryAddress) as CasimirRegistry + const upkeep = await ethers.getContractAt("CasimirUpkeep", managerConfig.upkeepAddress) as CasimirUpkeep + const views = await ethers.getContractAt("CasimirViews", managerConfig.viewsAddress) as CasimirViews - // const pause = await manager.connect(owner).setPaused(false) - // await pause.wait() - const requestReport = await upkeep.connect(owner).requestReport() - await requestReport.wait() + // const pause = await manager.connect(owner).setPaused(false) + // await pause.wait() + const requestReport = await upkeep.connect(owner).requestReport() + await requestReport.wait() - if (process.env.SIMULATE_UPKEEP === "true") { - await runUpkeep({ donTransmitter, upkeep }) - let finalizedReport = false - while (!finalizedReport) { - finalizedReport = await runUpkeep({ donTransmitter, upkeep }) - await new Promise(resolve => setTimeout(resolve, 2500)) + if (process.env.SIMULATE_UPKEEP === "true") { + await runUpkeep({ donTransmitter, upkeep }) + let finalizedReport = false + while (!finalizedReport) { + finalizedReport = await runUpkeep({ donTransmitter, upkeep }) + await new Promise(resolve => setTimeout(resolve, 2500)) + } + const poolIds = await manager.getStakedPoolIds() + const sweptBalance = await views.getSweptBalance(0, poolIds.length) + console.log("Swept balance", ethers.utils.formatEther(sweptBalance)) + let totalBalance = ethers.BigNumber.from(0) + for (const poolId of poolIds) { + const poolAddress = await manager.getPoolAddress(poolId) + const poolBalance = await ethers.provider.getBalance(poolAddress) + totalBalance = totalBalance.add(poolBalance) + console.log("Pool", poolId, ethers.utils.formatEther(poolBalance)) + } + console.log("Total balance", ethers.utils.formatEther(totalBalance)) } - const poolIds = await manager.getStakedPoolIds() - const sweptBalance = await views.getSweptBalance(0, poolIds.length) - console.log("Swept balance", ethers.utils.formatEther(sweptBalance)) - let totalBalance = ethers.BigNumber.from(0) - for (const poolId of poolIds) { - const poolAddress = await manager.getPoolAddress(poolId) - const poolBalance = await ethers.provider.getBalance(poolAddress) - totalBalance = totalBalance.add(poolBalance) - console.log("Pool", poolId, ethers.utils.formatEther(poolBalance)) - } - console.log("Total balance", ethers.utils.formatEther(totalBalance)) - } }() \ No newline at end of file diff --git a/contracts/ethereum/scripts/test.ts b/contracts/ethereum/scripts/test.ts index d0a817e22..6a0673c24 100644 --- a/contracts/ethereum/scripts/test.ts +++ b/contracts/ethereum/scripts/test.ts @@ -7,43 +7,43 @@ import { run } from "@casimir/shell" * Test ethereum contracts and services */ async function test() { - if (process.env.USE_SECRETS !== "false") { - await loadCredentials() - process.env.BIP39_SEED = process.env.BIP39_SEED || await getSecret("consensus-networks-bip39-seed") as string - } else { - process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" - } - console.log(`Your mnemonic is ${process.env.BIP39_SEED}`) - - process.env.FORK = process.env.FORK || "testnet" - - const networkKey = process.env.FORK.toUpperCase() as keyof typeof ETHEREUM_RPC_URL - process.env.ETHEREUM_FORK_RPC_URL = ETHEREUM_RPC_URL[networkKey] + if (process.env.USE_SECRETS !== "false") { + await loadCredentials() + process.env.BIP39_SEED = process.env.BIP39_SEED || await getSecret("consensus-networks-bip39-seed") as string + } else { + process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" + } + console.log(`Your mnemonic is ${process.env.BIP39_SEED}`) + + process.env.FORK = process.env.FORK || "testnet" + + const networkKey = process.env.FORK.toUpperCase() as keyof typeof ETHEREUM_RPC_URL + process.env.ETHEREUM_FORK_RPC_URL = ETHEREUM_RPC_URL[networkKey] - const networkName = ETHEREUM_NETWORK_NAME[networkKey] - console.log(`Using ${networkName} fork from ${process.env.ETHEREUM_FORK_RPC_URL}`) + const networkName = ETHEREUM_NETWORK_NAME[networkKey] + console.log(`Using ${networkName} fork from ${process.env.ETHEREUM_FORK_RPC_URL}`) - const provider = new ethers.providers.JsonRpcProvider(process.env.ETHEREUM_FORK_RPC_URL) - const wallet = ethers.Wallet.fromMnemonic(process.env.BIP39_SEED) + const provider = new ethers.providers.JsonRpcProvider(process.env.ETHEREUM_FORK_RPC_URL) + const wallet = ethers.Wallet.fromMnemonic(process.env.BIP39_SEED) - // Account for the mock, beacon, and library deployments - const walletNonce = await provider.getTransactionCount(wallet.address) + 14 + // Account for the mock, beacon, and library deployments + const walletNonce = await provider.getTransactionCount(wallet.address) + 14 - process.env.FACTORY_ADDRESS = ethers.utils.getContractAddress({ - from: wallet.address, - nonce: walletNonce - }) - console.log(`Expecting factory at ${process.env.FACTORY_ADDRESS}`) + process.env.FACTORY_ADDRESS = ethers.utils.getContractAddress({ + from: wallet.address, + nonce: walletNonce + }) + console.log(`Expecting factory at ${process.env.FACTORY_ADDRESS}`) - process.env.SSV_NETWORK_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_NETWORK_ADDRESS - process.env.SSV_VIEWS_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_VIEWS_ADDRESS - process.env.SWAP_FACTORY_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SWAP_FACTORY_ADDRESS + process.env.SSV_NETWORK_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_NETWORK_ADDRESS + process.env.SSV_VIEWS_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_VIEWS_ADDRESS + process.env.SWAP_FACTORY_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SWAP_FACTORY_ADDRESS - await run("npm run generate --workspace @casimir/oracle") - run("npm hardhat test") + await run("npm run generate --workspace @casimir/oracle") + run("npm hardhat test") } test().catch(error => { - console.error(error) - process.exit(1) + console.error(error) + process.exit(1) }) \ No newline at end of file diff --git a/contracts/ethereum/scripts/upgrade-all.ts b/contracts/ethereum/scripts/upgrade-all.ts index 80a5fdeac..966fa2e79 100644 --- a/contracts/ethereum/scripts/upgrade-all.ts +++ b/contracts/ethereum/scripts/upgrade-all.ts @@ -4,81 +4,82 @@ import { ethers, upgrades } from "hardhat" * Upgrade ethereum contracts */ void async function () { - // Redeploying functions billing registry for updates - // if (!process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS) throw new Error('No functions billing registry address provided') - if (!process.env.MANAGER_BEACON_ADDRESS) throw new Error("No manager beacon address provided") - if (!process.env.POOL_BEACON_ADDRESS) throw new Error("No pool beacon address provided") - if (!process.env.REGISTRY_BEACON_ADDRESS) throw new Error("No registry beacon address provided") - if (!process.env.UPKEEP_BEACON_ADDRESS) throw new Error("No upkeep beacon address provided") - if (!process.env.VIEWS_BEACON_ADDRESS) throw new Error("No views address provided") - if (!process.env.FACTORY_ADDRESS) throw new Error("No factory address provided") - if (!process.env.KEEPER_REGISTRAR_ADDRESS) throw new Error("No keeper registrar address provided") - if (!process.env.KEEPER_REGISTRY_ADDRESS) throw new Error("No keeper registry address provided") - if (!process.env.LINK_TOKEN_ADDRESS) throw new Error("No link token address provided") - if (!process.env.SSV_NETWORK_ADDRESS) throw new Error("No ssv network address provided") - if (!process.env.SSV_TOKEN_ADDRESS) throw new Error("No ssv token address provided") - if (!process.env.SSV_VIEWS_ADDRESS) throw new Error("No ssv views address provided") - if (!process.env.SWAP_FACTORY_ADDRESS) throw new Error("No swap factory address provided") - if (!process.env.SWAP_ROUTER_ADDRESS) throw new Error("No swap router address provided") - if (!process.env.WETH_TOKEN_ADDRESS) throw new Error("No weth token address provided") + // Redeploying functions billing registry for updates + // if (!process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS) throw new Error('No functions billing registry address provided') + if (!process.env.MANAGER_BEACON_ADDRESS) throw new Error("No manager beacon address provided") + if (!process.env.POOL_BEACON_ADDRESS) throw new Error("No pool beacon address provided") + if (!process.env.REGISTRY_BEACON_ADDRESS) throw new Error("No registry beacon address provided") + if (!process.env.UPKEEP_BEACON_ADDRESS) throw new Error("No upkeep beacon address provided") + if (!process.env.VIEWS_BEACON_ADDRESS) throw new Error("No views address provided") + if (!process.env.FACTORY_ADDRESS) throw new Error("No factory address provided") + if (!process.env.KEEPER_REGISTRAR_ADDRESS) throw new Error("No keeper registrar address provided") + if (!process.env.KEEPER_REGISTRY_ADDRESS) throw new Error("No keeper registry address provided") + if (!process.env.LINK_TOKEN_ADDRESS) throw new Error("No link token address provided") + if (!process.env.SSV_NETWORK_ADDRESS) throw new Error("No ssv network address provided") + if (!process.env.SSV_TOKEN_ADDRESS) throw new Error("No ssv token address provided") + if (!process.env.SSV_VIEWS_ADDRESS) throw new Error("No ssv views address provided") + if (!process.env.SWAP_FACTORY_ADDRESS) throw new Error("No swap factory address provided") + if (!process.env.SWAP_ROUTER_ADDRESS) throw new Error("No swap router address provided") + if (!process.env.WETH_TOKEN_ADDRESS) throw new Error("No weth token address provided") - const [, , donTransmitter] = await ethers.getSigners() + const [, , donTransmitter] = await ethers.getSigners() - const functionsOracleFactoryFactory = await ethers.getContractFactory("FunctionsOracleFactory") - const functionsOracleFactory = await functionsOracleFactoryFactory.deploy() - await functionsOracleFactory.deployed() - console.log(`FunctionsOracleFactory contract deployed to ${functionsOracleFactory.address}`) + const functionsOracleFactoryFactory = await ethers.getContractFactory("FunctionsOracleFactory") + const functionsOracleFactory = await functionsOracleFactoryFactory.deploy() + await functionsOracleFactory.deployed() + console.log(`FunctionsOracleFactory contract deployed to ${functionsOracleFactory.address}`) - const deployNewOracle = await functionsOracleFactory.deployNewOracle() - const deployNewOracleReceipt = await deployNewOracle.wait() - if (!deployNewOracleReceipt.events) throw new Error("Functions oracle deployment failed") - const functionsOracleAddress = deployNewOracleReceipt.events[1].args?.don as string - const functionsOracle = await ethers.getContractAt("FunctionsOracle", functionsOracleAddress) - const acceptOwnership = await functionsOracle.acceptOwnership() - await acceptOwnership.wait() - console.log(`FunctionsOracle contract deployed to ${functionsOracle.address}`) + const deployNewOracle = await functionsOracleFactory.deployNewOracle() + const deployNewOracleReceipt = await deployNewOracle.wait() + if (!deployNewOracleReceipt.events) throw new Error("Functions oracle deployment failed") + const functionsOracleAddress = deployNewOracleReceipt.events[1].args?.don as string + const functionsOracle = await ethers.getContractAt("FunctionsOracle", functionsOracleAddress) + const acceptOwnership = await functionsOracle.acceptOwnership() + await acceptOwnership.wait() + console.log(`FunctionsOracle contract deployed to ${functionsOracle.address}`) - const functionsBillingRegistryArgs = { - linkTokenAddress: process.env.LINK_TOKEN_ADDRESS, - linkEthFeedAddress: process.env.LINK_ETH_FEED_ADDRESS, - functionsOracleAddress: functionsOracle.address - } - const functionsBillingRegistryFactory = await ethers.getContractFactory("FunctionsBillingRegistry") - const functionsBillingRegistry = await functionsBillingRegistryFactory.deploy(...Object.values(functionsBillingRegistryArgs)) - await functionsBillingRegistry.deployed() - console.log(`FunctionsBillingRegistry contract deployed to ${functionsBillingRegistry.address}`) + const functionsBillingRegistryArgs = { + linkTokenAddress: process.env.LINK_TOKEN_ADDRESS, + linkEthFeedAddress: process.env.LINK_ETH_FEED_ADDRESS, + functionsOracleAddress: functionsOracle.address + } + const functionsBillingRegistryFactory = await ethers.getContractFactory("FunctionsBillingRegistry") + const functionsBillingRegistry = + await functionsBillingRegistryFactory.deploy(...Object.values(functionsBillingRegistryArgs)) + await functionsBillingRegistry.deployed() + console.log(`FunctionsBillingRegistry contract deployed to ${functionsBillingRegistry.address}`) - const functionsBillingRegistryConfig = { - maxGasLimit: 400_000, - stalenessSeconds: 86_400, - gasAfterPaymentCalculation: + const functionsBillingRegistryConfig = { + maxGasLimit: 400_000, + stalenessSeconds: 86_400, + gasAfterPaymentCalculation: 21_000 + 5_000 + 2_100 + 20_000 + 2 * 2_100 - 15_000 + 7_315, - weiPerUnitLink: ethers.BigNumber.from("5000000000000000"), - gasOverhead: 100_000, - requestTimeoutSeconds: 300, - } + weiPerUnitLink: ethers.BigNumber.from("5000000000000000"), + gasOverhead: 100_000, + requestTimeoutSeconds: 300, + } - await functionsBillingRegistry.setConfig( - functionsBillingRegistryConfig.maxGasLimit, - functionsBillingRegistryConfig.stalenessSeconds, - functionsBillingRegistryConfig.gasAfterPaymentCalculation, - functionsBillingRegistryConfig.weiPerUnitLink, - functionsBillingRegistryConfig.gasOverhead, - functionsBillingRegistryConfig.requestTimeoutSeconds - ) + await functionsBillingRegistry.setConfig( + functionsBillingRegistryConfig.maxGasLimit, + functionsBillingRegistryConfig.stalenessSeconds, + functionsBillingRegistryConfig.gasAfterPaymentCalculation, + functionsBillingRegistryConfig.weiPerUnitLink, + functionsBillingRegistryConfig.gasOverhead, + functionsBillingRegistryConfig.requestTimeoutSeconds + ) - const beaconLibraryFactory = await ethers.getContractFactory("CasimirBeacon") - const beaconLibrary = await beaconLibraryFactory.deploy() - console.log(`CasimirBeacon library deployed at ${beaconLibrary.address}`) + const beaconLibraryFactory = await ethers.getContractFactory("CasimirBeacon") + const beaconLibrary = await beaconLibraryFactory.deploy() + console.log(`CasimirBeacon library deployed at ${beaconLibrary.address}`) - const managerBeaconFactory = await ethers.getContractFactory("CasimirManager", { - libraries: { - CasimirBeacon: beaconLibrary.address - } - }) - const managerBeacon = await upgrades.upgradeBeacon(process.env.MANAGER_BEACON_ADDRESS, managerBeaconFactory, { - constructorArgs: [ - functionsBillingRegistry.address, + const managerBeaconFactory = await ethers.getContractFactory("CasimirManager", { + libraries: { + CasimirBeacon: beaconLibrary.address + } + }) + const managerBeacon = await upgrades.upgradeBeacon(process.env.MANAGER_BEACON_ADDRESS, managerBeaconFactory, { + constructorArgs: [ + functionsBillingRegistry.address, process.env.KEEPER_REGISTRAR_ADDRESS as string, process.env.KEEPER_REGISTRY_ADDRESS as string, process.env.LINK_TOKEN_ADDRESS as string, @@ -87,66 +88,66 @@ void async function () { process.env.SWAP_FACTORY_ADDRESS as string, process.env.SWAP_ROUTER_ADDRESS as string, process.env.WETH_TOKEN_ADDRESS as string - ], - unsafeAllow: ["external-library-linking"] - }) - await managerBeacon.deployed() - console.log(`CasimirManager beacon upgraded at ${managerBeacon.address}`) + ], + unsafeAllow: ["external-library-linking"] + }) + await managerBeacon.deployed() + console.log(`CasimirManager beacon upgraded at ${managerBeacon.address}`) - const poolBeaconFactory = await ethers.getContractFactory("CasimirPool") - const poolBeacon = await upgrades.upgradeBeacon(process.env.POOL_BEACON_ADDRESS, poolBeaconFactory, { - constructorArgs: [ + const poolBeaconFactory = await ethers.getContractFactory("CasimirPool") + const poolBeacon = await upgrades.upgradeBeacon(process.env.POOL_BEACON_ADDRESS, poolBeaconFactory, { + constructorArgs: [ process.env.DEPOSIT_CONTRACT_ADDRESS as string - ] - }) - await poolBeacon.deployed() - console.log(`CasimirPool beacon upgraded at ${poolBeacon.address}`) + ] + }) + await poolBeacon.deployed() + console.log(`CasimirPool beacon upgraded at ${poolBeacon.address}`) - const registryBeaconFactory = await ethers.getContractFactory("CasimirRegistry") - const registryBeacon = await upgrades.upgradeBeacon(process.env.REGISTRY_BEACON_ADDRESS, registryBeaconFactory, { - constructorArgs: [ + const registryBeaconFactory = await ethers.getContractFactory("CasimirRegistry") + const registryBeacon = await upgrades.upgradeBeacon(process.env.REGISTRY_BEACON_ADDRESS, registryBeaconFactory, { + constructorArgs: [ process.env.SSV_VIEWS_ADDRESS as string - ] - }) - await registryBeacon.deployed() - console.log(`CasimirRegistry beacon upgraded at ${registryBeacon.address}`) + ] + }) + await registryBeacon.deployed() + console.log(`CasimirRegistry beacon upgraded at ${registryBeacon.address}`) - const upkeepBeaconFactory = await ethers.getContractFactory("CasimirUpkeep") - const upkeepBeacon = await upgrades.upgradeBeacon(process.env.UPKEEP_BEACON_ADDRESS, upkeepBeaconFactory) - await upkeepBeacon.deployed() - console.log(`CasimirUpkeep beacon upgraded at ${upkeepBeacon.address}`) + const upkeepBeaconFactory = await ethers.getContractFactory("CasimirUpkeep") + const upkeepBeacon = await upgrades.upgradeBeacon(process.env.UPKEEP_BEACON_ADDRESS, upkeepBeaconFactory) + await upkeepBeacon.deployed() + console.log(`CasimirUpkeep beacon upgraded at ${upkeepBeacon.address}`) - const viewsBeaconFactory = await ethers.getContractFactory("CasimirViews") - const viewsBeacon = await upgrades.upgradeBeacon(process.env.VIEWS_BEACON_ADDRESS, viewsBeaconFactory) - await viewsBeacon.deployed() - console.log(`CasimirViews beacon upgraded at ${viewsBeacon.address}`) + const viewsBeaconFactory = await ethers.getContractFactory("CasimirViews") + const viewsBeacon = await upgrades.upgradeBeacon(process.env.VIEWS_BEACON_ADDRESS, viewsBeaconFactory) + await viewsBeacon.deployed() + console.log(`CasimirViews beacon upgraded at ${viewsBeacon.address}`) - const factoryFactory = await ethers.getContractFactory("CasimirFactory", { - libraries: { - CasimirBeacon: beaconLibrary.address - } - }) - const factory = await upgrades.upgradeProxy(process.env.FACTORY_ADDRESS, factoryFactory, { - constructorArgs: [ - managerBeacon.address, - poolBeacon.address, - registryBeacon.address, - upkeepBeacon.address, - viewsBeacon.address - ], - unsafeAllow: ["external-library-linking"] - }) - await factory.deployed() - console.log(`CasimirFactory contract upgraded at ${factory.address}`) + const factoryFactory = await ethers.getContractFactory("CasimirFactory", { + libraries: { + CasimirBeacon: beaconLibrary.address + } + }) + const factory = await upgrades.upgradeProxy(process.env.FACTORY_ADDRESS, factoryFactory, { + constructorArgs: [ + managerBeacon.address, + poolBeacon.address, + registryBeacon.address, + upkeepBeacon.address, + viewsBeacon.address + ], + unsafeAllow: ["external-library-linking"] + }) + await factory.deployed() + console.log(`CasimirFactory contract upgraded at ${factory.address}`) - const [managerId] = await factory.getManagerIds() - const managerConfig = await factory.getManagerConfig(managerId) - const upkeep = await ethers.getContractAt("CasimirUpkeep", managerConfig.upkeepAddress) - await upkeep.setFunctionsOracle(functionsOracle.address) - await functionsBillingRegistry.setAuthorizedSenders([functionsOracle.address, donTransmitter.address]) - await functionsOracle.setAuthorizedSenders([donTransmitter.address, - managerConfig.managerAddress, - managerConfig.upkeepAddress]) - await functionsOracle.setRegistry(functionsBillingRegistry.address) + const [managerId] = await factory.getManagerIds() + const managerConfig = await factory.getManagerConfig(managerId) + const upkeep = await ethers.getContractAt("CasimirUpkeep", managerConfig.upkeepAddress) + await upkeep.setFunctionsOracle(functionsOracle.address) + await functionsBillingRegistry.setAuthorizedSenders([functionsOracle.address, donTransmitter.address]) + await functionsOracle.setAuthorizedSenders([donTransmitter.address, + managerConfig.managerAddress, + managerConfig.upkeepAddress]) + await functionsOracle.setRegistry(functionsBillingRegistry.address) }() \ No newline at end of file diff --git a/contracts/ethereum/scripts/upgrade-proxies.ts b/contracts/ethereum/scripts/upgrade-proxies.ts index 803045402..3c707038d 100644 --- a/contracts/ethereum/scripts/upgrade-proxies.ts +++ b/contracts/ethereum/scripts/upgrade-proxies.ts @@ -4,89 +4,89 @@ import { ethers, upgrades } from "hardhat" * Upgrade ethereum contracts */ void async function () { - if (!process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS) throw new Error("No functions billing registry address provided") - if (!process.env.BEACON_LIBRARY_ADDRESS) throw new Error("No beacon library address provided") - if (!process.env.MANAGER_BEACON_ADDRESS) throw new Error("No manager beacon address provided") - if (!process.env.POOL_BEACON_ADDRESS) throw new Error("No pool beacon address provided") - if (!process.env.REGISTRY_BEACON_ADDRESS) throw new Error("No registry beacon address provided") - if (!process.env.UPKEEP_BEACON_ADDRESS) throw new Error("No upkeep beacon address provided") - if (!process.env.VIEWS_BEACON_ADDRESS) throw new Error("No views address provided") - if (!process.env.FACTORY_ADDRESS) throw new Error("No factory address provided") - if (!process.env.KEEPER_REGISTRAR_ADDRESS) throw new Error("No keeper registrar address provided") - if (!process.env.KEEPER_REGISTRY_ADDRESS) throw new Error("No keeper registry address provided") - if (!process.env.LINK_TOKEN_ADDRESS) throw new Error("No link token address provided") - if (!process.env.SSV_NETWORK_ADDRESS) throw new Error("No ssv network address provided") - if (!process.env.SSV_TOKEN_ADDRESS) throw new Error("No ssv token address provided") - if (!process.env.SSV_VIEWS_ADDRESS) throw new Error("No ssv views address provided") - if (!process.env.SWAP_FACTORY_ADDRESS) throw new Error("No swap factory address provided") - if (!process.env.SWAP_ROUTER_ADDRESS) throw new Error("No swap router address provided") - if (!process.env.WETH_TOKEN_ADDRESS) throw new Error("No weth token address provided") + if (!process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS) throw new Error("No functions billing registry address provided") + if (!process.env.BEACON_LIBRARY_ADDRESS) throw new Error("No beacon library address provided") + if (!process.env.MANAGER_BEACON_ADDRESS) throw new Error("No manager beacon address provided") + if (!process.env.POOL_BEACON_ADDRESS) throw new Error("No pool beacon address provided") + if (!process.env.REGISTRY_BEACON_ADDRESS) throw new Error("No registry beacon address provided") + if (!process.env.UPKEEP_BEACON_ADDRESS) throw new Error("No upkeep beacon address provided") + if (!process.env.VIEWS_BEACON_ADDRESS) throw new Error("No views address provided") + if (!process.env.FACTORY_ADDRESS) throw new Error("No factory address provided") + if (!process.env.KEEPER_REGISTRAR_ADDRESS) throw new Error("No keeper registrar address provided") + if (!process.env.KEEPER_REGISTRY_ADDRESS) throw new Error("No keeper registry address provided") + if (!process.env.LINK_TOKEN_ADDRESS) throw new Error("No link token address provided") + if (!process.env.SSV_NETWORK_ADDRESS) throw new Error("No ssv network address provided") + if (!process.env.SSV_TOKEN_ADDRESS) throw new Error("No ssv token address provided") + if (!process.env.SSV_VIEWS_ADDRESS) throw new Error("No ssv views address provided") + if (!process.env.SWAP_FACTORY_ADDRESS) throw new Error("No swap factory address provided") + if (!process.env.SWAP_ROUTER_ADDRESS) throw new Error("No swap router address provided") + if (!process.env.WETH_TOKEN_ADDRESS) throw new Error("No weth token address provided") - const managerBeaconFactory = await ethers.getContractFactory("CasimirManager", { - libraries: { - CasimirBeacon: process.env.BEACON_LIBRARY_ADDRESS - } - }) - const managerBeacon = await upgrades.upgradeBeacon(process.env.MANAGER_BEACON_ADDRESS, managerBeaconFactory, { - constructorArgs: [ - process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS, - process.env.KEEPER_REGISTRAR_ADDRESS, - process.env.KEEPER_REGISTRY_ADDRESS, - process.env.LINK_TOKEN_ADDRESS, - process.env.SSV_NETWORK_ADDRESS, - process.env.SSV_TOKEN_ADDRESS, - process.env.SWAP_FACTORY_ADDRESS, - process.env.SWAP_ROUTER_ADDRESS, - process.env.WETH_TOKEN_ADDRESS - ], - unsafeAllow: ["external-library-linking"] - }) - await managerBeacon.deployed() - console.log(`CasimirManager beacon upgraded at ${managerBeacon.address}`) + const managerBeaconFactory = await ethers.getContractFactory("CasimirManager", { + libraries: { + CasimirBeacon: process.env.BEACON_LIBRARY_ADDRESS + } + }) + const managerBeacon = await upgrades.upgradeBeacon(process.env.MANAGER_BEACON_ADDRESS, managerBeaconFactory, { + constructorArgs: [ + process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS, + process.env.KEEPER_REGISTRAR_ADDRESS, + process.env.KEEPER_REGISTRY_ADDRESS, + process.env.LINK_TOKEN_ADDRESS, + process.env.SSV_NETWORK_ADDRESS, + process.env.SSV_TOKEN_ADDRESS, + process.env.SWAP_FACTORY_ADDRESS, + process.env.SWAP_ROUTER_ADDRESS, + process.env.WETH_TOKEN_ADDRESS + ], + unsafeAllow: ["external-library-linking"] + }) + await managerBeacon.deployed() + console.log(`CasimirManager beacon upgraded at ${managerBeacon.address}`) - const poolBeaconFactory = await ethers.getContractFactory("CasimirPool") - const poolBeacon = await upgrades.upgradeBeacon(process.env.POOL_BEACON_ADDRESS, poolBeaconFactory, { - constructorArgs: [ - process.env.DEPOSIT_CONTRACT_ADDRESS - ] - }) - await poolBeacon.deployed() - console.log(`CasimirPool beacon upgraded at ${poolBeacon.address}`) + const poolBeaconFactory = await ethers.getContractFactory("CasimirPool") + const poolBeacon = await upgrades.upgradeBeacon(process.env.POOL_BEACON_ADDRESS, poolBeaconFactory, { + constructorArgs: [ + process.env.DEPOSIT_CONTRACT_ADDRESS + ] + }) + await poolBeacon.deployed() + console.log(`CasimirPool beacon upgraded at ${poolBeacon.address}`) - const registryBeaconFactory = await ethers.getContractFactory("CasimirRegistry") - const registryBeacon = await upgrades.upgradeBeacon(process.env.REGISTRY_BEACON_ADDRESS, registryBeaconFactory, { - constructorArgs: [ - process.env.SSV_VIEWS_ADDRESS - ] - }) - await registryBeacon.deployed() - console.log(`CasimirRegistry beacon upgraded at ${registryBeacon.address}`) + const registryBeaconFactory = await ethers.getContractFactory("CasimirRegistry") + const registryBeacon = await upgrades.upgradeBeacon(process.env.REGISTRY_BEACON_ADDRESS, registryBeaconFactory, { + constructorArgs: [ + process.env.SSV_VIEWS_ADDRESS + ] + }) + await registryBeacon.deployed() + console.log(`CasimirRegistry beacon upgraded at ${registryBeacon.address}`) - const upkeepBeaconFactory = await ethers.getContractFactory("CasimirUpkeep") - const upkeepBeacon = await upgrades.upgradeBeacon(process.env.UPKEEP_BEACON_ADDRESS, upkeepBeaconFactory) - await upkeepBeacon.deployed() - console.log(`CasimirUpkeep beacon upgraded at ${upkeepBeacon.address}`) + const upkeepBeaconFactory = await ethers.getContractFactory("CasimirUpkeep") + const upkeepBeacon = await upgrades.upgradeBeacon(process.env.UPKEEP_BEACON_ADDRESS, upkeepBeaconFactory) + await upkeepBeacon.deployed() + console.log(`CasimirUpkeep beacon upgraded at ${upkeepBeacon.address}`) - const viewsBeaconFactory = await ethers.getContractFactory("CasimirViews") - const viewsBeacon = await upgrades.upgradeBeacon(process.env.VIEWS_BEACON_ADDRESS, viewsBeaconFactory) - await viewsBeacon.deployed() - console.log(`CasimirViews beacon upgraded at ${viewsBeacon.address}`) + const viewsBeaconFactory = await ethers.getContractFactory("CasimirViews") + const viewsBeacon = await upgrades.upgradeBeacon(process.env.VIEWS_BEACON_ADDRESS, viewsBeaconFactory) + await viewsBeacon.deployed() + console.log(`CasimirViews beacon upgraded at ${viewsBeacon.address}`) - const factoryFactory = await ethers.getContractFactory("CasimirFactory", { - libraries: { - CasimirBeacon: process.env.BEACON_LIBRARY_ADDRESS - } - }) - const factory = await upgrades.upgradeProxy(process.env.FACTORY_ADDRESS, factoryFactory, { - constructorArgs: [ - managerBeacon.address, - poolBeacon.address, - registryBeacon.address, - upkeepBeacon.address, - viewsBeacon.address - ], - unsafeAllow: ["external-library-linking"] - }) - await factory.deployed() - console.log(`CasimirFactory contract upgraded at ${factory.address}`) + const factoryFactory = await ethers.getContractFactory("CasimirFactory", { + libraries: { + CasimirBeacon: process.env.BEACON_LIBRARY_ADDRESS + } + }) + const factory = await upgrades.upgradeProxy(process.env.FACTORY_ADDRESS, factoryFactory, { + constructorArgs: [ + managerBeacon.address, + poolBeacon.address, + registryBeacon.address, + upkeepBeacon.address, + viewsBeacon.address + ], + unsafeAllow: ["external-library-linking"] + }) + await factory.deployed() + console.log(`CasimirFactory contract upgraded at ${factory.address}`) }() \ No newline at end of file diff --git a/contracts/ethereum/test/debug.ts b/contracts/ethereum/test/debug.ts index 647ea1b63..dc420c606 100644 --- a/contracts/ethereum/test/debug.ts +++ b/contracts/ethereum/test/debug.ts @@ -10,94 +10,110 @@ import ICasimirViewsAbi from "../build/abi/ICasimirViews.json" import { CasimirManagerDev, CasimirRegistry, CasimirUpkeepDev, CasimirViews } from "../build/@types" describe("Upgrades", async function () { - it("Check values with dev", async function () { - if (process.env.DEBUG) { - const debugBlockNumber = process.env.ETHEREUM_FORK_BLOCK ? parseInt(process.env.ETHEREUM_FORK_BLOCK) : await ethers.provider.getBlockNumber() - const networkKey = (process.env.NETWORK?.toUpperCase() || "TESTNET") as keyof typeof ETHEREUM_CONTRACTS - const factory = new ethers.Contract(ETHEREUM_CONTRACTS[networkKey].FACTORY_ADDRESS, CasimirFactoryAbi, ethers.provider) - const [managerId] = await factory.getManagerIds() - const managerConfig = await factory.getManagerConfig(managerId) + it("Check values with dev", async function () { + if (process.env.DEBUG) { + const debugBlockNumber = + process.env.ETHEREUM_FORK_BLOCK ? + parseInt(process.env.ETHEREUM_FORK_BLOCK) + : await ethers.provider.getBlockNumber() + const networkKey = (process.env.NETWORK?.toUpperCase() || "TESTNET") as keyof typeof ETHEREUM_CONTRACTS + const factory = new ethers.Contract( + ETHEREUM_CONTRACTS[networkKey].FACTORY_ADDRESS, CasimirFactoryAbi, ethers.provider + ) + const [managerId] = await factory.getManagerIds() + const managerConfig = await factory.getManagerConfig(managerId) - const managerDevFactory = await ethers.getContractFactory("CasimirManagerDev", { - libraries: { - CasimirBeacon: ETHEREUM_CONTRACTS[networkKey].BEACON_LIBRARY_ADDRESS - } - }) - const managerBeacon = await upgrades.upgradeBeacon(ETHEREUM_CONTRACTS[networkKey].MANAGER_BEACON_ADDRESS, managerDevFactory, { - constructorArgs: [ - ETHEREUM_CONTRACTS[networkKey].FUNCTIONS_BILLING_REGISTRY_ADDRESS, - ETHEREUM_CONTRACTS[networkKey].KEEPER_REGISTRAR_ADDRESS, - ETHEREUM_CONTRACTS[networkKey].KEEPER_REGISTRY_ADDRESS, - ETHEREUM_CONTRACTS[networkKey].LINK_TOKEN_ADDRESS, - ETHEREUM_CONTRACTS[networkKey].SSV_NETWORK_ADDRESS, - ETHEREUM_CONTRACTS[networkKey].SSV_TOKEN_ADDRESS, - ETHEREUM_CONTRACTS[networkKey].SWAP_FACTORY_ADDRESS, - ETHEREUM_CONTRACTS[networkKey].SWAP_ROUTER_ADDRESS, - ETHEREUM_CONTRACTS[networkKey].WETH_TOKEN_ADDRESS - ], - unsafeAllow: ["external-library-linking"] - }) - await managerBeacon.deployed() - const manager = new ethers.Contract(managerConfig.managerAddress, ICasimirManagerDevAbi, ethers.provider) as CasimirManagerDev - console.log(`CasimirManager beacon upgraded at ${manager.address}`) + const managerDevFactory = await ethers.getContractFactory("CasimirManagerDev", { + libraries: { + CasimirBeacon: ETHEREUM_CONTRACTS[networkKey].BEACON_LIBRARY_ADDRESS + } + }) + const managerBeacon = await upgrades + .upgradeBeacon(ETHEREUM_CONTRACTS[networkKey] + .MANAGER_BEACON_ADDRESS, managerDevFactory, { + constructorArgs: [ + ETHEREUM_CONTRACTS[networkKey].FUNCTIONS_BILLING_REGISTRY_ADDRESS, + ETHEREUM_CONTRACTS[networkKey].KEEPER_REGISTRAR_ADDRESS, + ETHEREUM_CONTRACTS[networkKey].KEEPER_REGISTRY_ADDRESS, + ETHEREUM_CONTRACTS[networkKey].LINK_TOKEN_ADDRESS, + ETHEREUM_CONTRACTS[networkKey].SSV_NETWORK_ADDRESS, + ETHEREUM_CONTRACTS[networkKey].SSV_TOKEN_ADDRESS, + ETHEREUM_CONTRACTS[networkKey].SWAP_FACTORY_ADDRESS, + ETHEREUM_CONTRACTS[networkKey].SWAP_ROUTER_ADDRESS, + ETHEREUM_CONTRACTS[networkKey].WETH_TOKEN_ADDRESS + ], + unsafeAllow: ["external-library-linking"] + }) + await managerBeacon.deployed() + const manager = new ethers.Contract( + managerConfig.managerAddress, ICasimirManagerDevAbi, ethers.provider + ) as CasimirManagerDev + console.log(`CasimirManager beacon upgraded at ${manager.address}`) - const registry = new ethers.Contract(managerConfig.registryAddress, ICasimirRegistryAbi, ethers.provider) as CasimirRegistry + const registry = new ethers.Contract( + managerConfig.registryAddress, ICasimirRegistryAbi, ethers.provider + ) as CasimirRegistry - const upkeepDevFactory = await ethers.getContractFactory("CasimirUpkeepDev") - const upkeepBeacon = await upgrades.upgradeBeacon(ETHEREUM_CONTRACTS["TESTNET"].UPKEEP_BEACON_ADDRESS, upkeepDevFactory) - await upkeepBeacon.deployed() - const upkeep = new ethers.Contract(managerConfig.upkeepAddress, ICasimirUpkeepDevAbi, ethers.provider) as CasimirUpkeepDev - console.log(`CasimirUpkeep beacon upgraded at ${upkeep.address}`) + const upkeepDevFactory = await ethers.getContractFactory("CasimirUpkeepDev") + const upkeepBeacon = await upgrades.upgradeBeacon(ETHEREUM_CONTRACTS["TESTNET"].UPKEEP_BEACON_ADDRESS, upkeepDevFactory) + await upkeepBeacon.deployed() + const upkeep = new ethers.Contract( + managerConfig.upkeepAddress, ICasimirUpkeepDevAbi, ethers.provider + ) as CasimirUpkeepDev + console.log(`CasimirUpkeep beacon upgraded at ${upkeep.address}`) - const views = new ethers.Contract(managerConfig.viewsAddress, ICasimirViewsAbi, ethers.provider) as CasimirViews + const views = new ethers.Contract( + managerConfig.viewsAddress, ICasimirViewsAbi, ethers.provider + ) as CasimirViews - const latestActiveRewardBalance = await manager.getLatestActiveRewardBalance() - const latestBeaconBalance = await manager.latestBeaconBalance() - const stakeRatioSum = await manager.getStakeRatioSum() - const totalStake = await manager.getTotalStake() - const deposits = await manager.queryFilter(manager.filters.StakeDeposited(), 0, debugBlockNumber) - const userAddresses = deposits.map(deposit => deposit.args?.sender).filter((value, index, self) => self.indexOf(value) === index) - const userStakes: Record = {} - for (const userAddress of userAddresses) { - const userStake = await manager.getUserStake(userAddress) - userStakes[userAddress] = ethers.utils.formatEther(userStake) - } + const latestActiveRewardBalance = await manager.getLatestActiveRewardBalance() + const latestBeaconBalance = await manager.latestBeaconBalance() + const stakeRatioSum = await manager.getStakeRatioSum() + const totalStake = await manager.getTotalStake() + const deposits = await manager.queryFilter(manager.filters.StakeDeposited(), 0, debugBlockNumber) + const userAddresses = deposits + .map(deposit => deposit.args?.sender).filter((value, index, self) => self.indexOf(value) === index) + const userStakes: Record = {} + for (const userAddress of userAddresses) { + const userStake = await manager.getUserStake(userAddress) + userStakes[userAddress] = ethers.utils.formatEther(userStake) + } - // const depositedPoolCount = await views.getDepositedPoolCount() - // const compoundablePoolIds = await views.getCompoundablePoolIds(0, depositedPoolCount) - // const sweptBalance = await views.getSweptBalance(0, depositedPoolCount) + // const depositedPoolCount = await views.getDepositedPoolCount() + // const compoundablePoolIds = await views.getCompoundablePoolIds(0, depositedPoolCount) + // const sweptBalance = await views.getSweptBalance(0, depositedPoolCount) - const dust = totalStake.sub(Object.values(userStakes).reduce((acc, curr) => { - return acc.add(ethers.utils.parseEther(curr)) - }, ethers.utils.parseEther("0"))) - const values = { - // compoundablePoolIds, - dust: ethers.utils.formatEther(dust), - latestActiveRewardBalance: ethers.utils.formatEther(latestActiveRewardBalance), - latestBeaconBalance: ethers.utils.formatEther(latestBeaconBalance), - stakeRatioSum: ethers.utils.formatEther(stakeRatioSum), - // sweptBalance: ethers.utils.formatEther(sweptBalance), - totalStake: ethers.utils.formatEther(totalStake), - userStakes - } - const debugBlock = { - block: debugBlockNumber, - values - } - const debugBlocksDir = "debug" - const debugBlocksFile = "blocks.json" - const debugBlocksPath = `${debugBlocksDir}/${debugBlocksFile}` - if (!fs.existsSync(debugBlocksDir)) { - fs.mkdirSync(debugBlocksDir, { recursive: true }) - } - let existingDebugBlocks: typeof debugBlock[] - try { - existingDebugBlocks = JSON.parse(fs.readFileSync(debugBlocksPath).toString()) - } catch (e) { - existingDebugBlocks = [] - } - existingDebugBlocks.push(debugBlock) - fs.writeFileSync(debugBlocksPath, JSON.stringify(existingDebugBlocks, null, 4)) - } - }) + const dust = totalStake.sub(Object.values(userStakes).reduce((acc, curr) => { + return acc.add(ethers.utils.parseEther(curr)) + }, ethers.utils.parseEther("0"))) + const values = { + // compoundablePoolIds, + dust: ethers.utils.formatEther(dust), + latestActiveRewardBalance: ethers.utils.formatEther(latestActiveRewardBalance), + latestBeaconBalance: ethers.utils.formatEther(latestBeaconBalance), + stakeRatioSum: ethers.utils.formatEther(stakeRatioSum), + // sweptBalance: ethers.utils.formatEther(sweptBalance), + totalStake: ethers.utils.formatEther(totalStake), + userStakes + } + const debugBlock = { + block: debugBlockNumber, + values + } + const debugBlocksDir = "debug" + const debugBlocksFile = "blocks.json" + const debugBlocksPath = `${debugBlocksDir}/${debugBlocksFile}` + if (!fs.existsSync(debugBlocksDir)) { + fs.mkdirSync(debugBlocksDir, { recursive: true }) + } + let existingDebugBlocks: typeof debugBlock[] + try { + existingDebugBlocks = JSON.parse(fs.readFileSync(debugBlocksPath).toString()) + } catch (e) { + existingDebugBlocks = [] + } + existingDebugBlocks.push(debugBlock) + fs.writeFileSync(debugBlocksPath, JSON.stringify(existingDebugBlocks, null, 4)) + } + }) }) \ No newline at end of file diff --git a/contracts/ethereum/test/fixtures/shared.ts b/contracts/ethereum/test/fixtures/shared.ts index 558b55bc4..9f0c3703e 100644 --- a/contracts/ethereum/test/fixtures/shared.ts +++ b/contracts/ethereum/test/fixtures/shared.ts @@ -11,73 +11,73 @@ upgrades.silenceWarnings() /** Fixture to deploy SSV manager contract */ export async function deploymentFixture() { - if (!process.env.DEPOSIT_CONTRACT_ADDRESS) throw new Error("No deposit contract address provided") - if (!process.env.KEEPER_REGISTRAR_ADDRESS) throw new Error("No keeper registrar address provided") - if (!process.env.KEEPER_REGISTRY_ADDRESS) throw new Error("No keeper registry address provided") - if (!process.env.LINK_TOKEN_ADDRESS) throw new Error("No link token address provided") - if (!process.env.LINK_ETH_FEED_ADDRESS) throw new Error("No link eth feed address provided") - if (!process.env.SSV_NETWORK_ADDRESS) throw new Error("No ssv network address provided") - if (!process.env.SSV_TOKEN_ADDRESS) throw new Error("No ssv token address provided") - if (!process.env.SWAP_FACTORY_ADDRESS) throw new Error("No swap factory address provided") - if (!process.env.SWAP_ROUTER_ADDRESS) throw new Error("No swap router address provided") - if (!process.env.WETH_TOKEN_ADDRESS) throw new Error("No weth token address provided") - - const [, daoOracle, - donTransmitter] = await ethers.getSigners() - - const functionsOracleFactoryFactory = await ethers.getContractFactory("FunctionsOracleFactory") - const functionsOracleFactory = await functionsOracleFactoryFactory.deploy() as FunctionsOracleFactory - await functionsOracleFactory.deployed() - - const deployNewOracle = await functionsOracleFactory.deployNewOracle() - const deployNewOracleReceipt = await deployNewOracle.wait() - if (!deployNewOracleReceipt.events) throw new Error("Functions oracle deployment failed") - const functionsOracleAddress = deployNewOracleReceipt.events[1].args?.don as string - const functionsOracle = await ethers.getContractAt("FunctionsOracle", functionsOracleAddress) as FunctionsOracle & AuthorizedReceiver - const acceptOwnership = await functionsOracle.acceptOwnership() - await acceptOwnership.wait() - - const functionsBillingRegistryArgs = { - linkTokenAddress: process.env.LINK_TOKEN_ADDRESS, - linkEthFeedAddress: process.env.LINK_ETH_FEED_ADDRESS, - functionsOracleAddress: functionsOracle.address - } - const functionsBillingRegistryFactory = await ethers.getContractFactory("FunctionsBillingRegistry") - const functionsBillingRegistry = await functionsBillingRegistryFactory.deploy( - ...Object.values(functionsBillingRegistryArgs) - ) as FunctionsBillingRegistry - await functionsBillingRegistry.deployed() - - const functionsBillingRegistryConfig = { - maxGasLimit: 400_000, - stalenessSeconds: 86_400, - gasAfterPaymentCalculation: + if (!process.env.DEPOSIT_CONTRACT_ADDRESS) throw new Error("No deposit contract address provided") + if (!process.env.KEEPER_REGISTRAR_ADDRESS) throw new Error("No keeper registrar address provided") + if (!process.env.KEEPER_REGISTRY_ADDRESS) throw new Error("No keeper registry address provided") + if (!process.env.LINK_TOKEN_ADDRESS) throw new Error("No link token address provided") + if (!process.env.LINK_ETH_FEED_ADDRESS) throw new Error("No link eth feed address provided") + if (!process.env.SSV_NETWORK_ADDRESS) throw new Error("No ssv network address provided") + if (!process.env.SSV_TOKEN_ADDRESS) throw new Error("No ssv token address provided") + if (!process.env.SWAP_FACTORY_ADDRESS) throw new Error("No swap factory address provided") + if (!process.env.SWAP_ROUTER_ADDRESS) throw new Error("No swap router address provided") + if (!process.env.WETH_TOKEN_ADDRESS) throw new Error("No weth token address provided") + + const [, daoOracle, + donTransmitter] = await ethers.getSigners() + + const functionsOracleFactoryFactory = await ethers.getContractFactory("FunctionsOracleFactory") + const functionsOracleFactory = await functionsOracleFactoryFactory.deploy() as FunctionsOracleFactory + await functionsOracleFactory.deployed() + + const deployNewOracle = await functionsOracleFactory.deployNewOracle() + const deployNewOracleReceipt = await deployNewOracle.wait() + if (!deployNewOracleReceipt.events) throw new Error("Functions oracle deployment failed") + const functionsOracleAddress = deployNewOracleReceipt.events[1].args?.don as string + const functionsOracle = await ethers.getContractAt("FunctionsOracle", functionsOracleAddress) as FunctionsOracle & AuthorizedReceiver + const acceptOwnership = await functionsOracle.acceptOwnership() + await acceptOwnership.wait() + + const functionsBillingRegistryArgs = { + linkTokenAddress: process.env.LINK_TOKEN_ADDRESS, + linkEthFeedAddress: process.env.LINK_ETH_FEED_ADDRESS, + functionsOracleAddress: functionsOracle.address + } + const functionsBillingRegistryFactory = await ethers.getContractFactory("FunctionsBillingRegistry") + const functionsBillingRegistry = await functionsBillingRegistryFactory.deploy( + ...Object.values(functionsBillingRegistryArgs) + ) as FunctionsBillingRegistry + await functionsBillingRegistry.deployed() + + const functionsBillingRegistryConfig = { + maxGasLimit: 400_000, + stalenessSeconds: 86_400, + gasAfterPaymentCalculation: 21_000 + 5_000 + 2_100 + 20_000 + 2 * 2_100 - 15_000 + 7_315, - weiPerUnitLink: ethers.BigNumber.from("5000000000000000"), - gasOverhead: 100_000, - requestTimeoutSeconds: 300, - } - - await functionsBillingRegistry.setConfig( - functionsBillingRegistryConfig.maxGasLimit, - functionsBillingRegistryConfig.stalenessSeconds, - functionsBillingRegistryConfig.gasAfterPaymentCalculation, - functionsBillingRegistryConfig.weiPerUnitLink, - functionsBillingRegistryConfig.gasOverhead, - functionsBillingRegistryConfig.requestTimeoutSeconds - ) - - const beaconLibraryFactory = await ethers.getContractFactory("CasimirBeacon") - const beaconLibrary = await beaconLibraryFactory.deploy() - - const managerBeaconFactory = await ethers.getContractFactory("CasimirManager", { - libraries: { - CasimirBeacon: beaconLibrary.address - } - }) - const managerBeacon = await upgrades.deployBeacon(managerBeaconFactory, { - constructorArgs: [ - functionsBillingRegistry.address, + weiPerUnitLink: ethers.BigNumber.from("5000000000000000"), + gasOverhead: 100_000, + requestTimeoutSeconds: 300, + } + + await functionsBillingRegistry.setConfig( + functionsBillingRegistryConfig.maxGasLimit, + functionsBillingRegistryConfig.stalenessSeconds, + functionsBillingRegistryConfig.gasAfterPaymentCalculation, + functionsBillingRegistryConfig.weiPerUnitLink, + functionsBillingRegistryConfig.gasOverhead, + functionsBillingRegistryConfig.requestTimeoutSeconds + ) + + const beaconLibraryFactory = await ethers.getContractFactory("CasimirBeacon") + const beaconLibrary = await beaconLibraryFactory.deploy() + + const managerBeaconFactory = await ethers.getContractFactory("CasimirManager", { + libraries: { + CasimirBeacon: beaconLibrary.address + } + }) + const managerBeacon = await upgrades.deployBeacon(managerBeaconFactory, { + constructorArgs: [ + functionsBillingRegistry.address, process.env.KEEPER_REGISTRAR_ADDRESS as string, process.env.KEEPER_REGISTRY_ADDRESS as string, process.env.LINK_TOKEN_ADDRESS as string, @@ -86,835 +86,986 @@ export async function deploymentFixture() { process.env.SWAP_FACTORY_ADDRESS as string, process.env.SWAP_ROUTER_ADDRESS as string, process.env.WETH_TOKEN_ADDRESS as string - ], - unsafeAllow: ["external-library-linking"] - }) - await managerBeacon.deployed() - - const poolBeaconFactory = await ethers.getContractFactory("CasimirPool") - const poolBeacon = await upgrades.deployBeacon(poolBeaconFactory, { - constructorArgs: [ + ], + unsafeAllow: ["external-library-linking"] + }) + await managerBeacon.deployed() + + const poolBeaconFactory = await ethers.getContractFactory("CasimirPool") + const poolBeacon = await upgrades.deployBeacon(poolBeaconFactory, { + constructorArgs: [ process.env.DEPOSIT_CONTRACT_ADDRESS as string - ] - }) - await poolBeacon.deployed() + ] + }) + await poolBeacon.deployed() - const registryBeaconFactory = await ethers.getContractFactory("CasimirRegistry") - const registryBeacon = await upgrades.deployBeacon(registryBeaconFactory, { - constructorArgs: [ + const registryBeaconFactory = await ethers.getContractFactory("CasimirRegistry") + const registryBeacon = await upgrades.deployBeacon(registryBeaconFactory, { + constructorArgs: [ process.env.SSV_VIEWS_ADDRESS as string - ] - }) - await registryBeacon.deployed() - - const upkeepBeaconFactory = await ethers.getContractFactory("CasimirUpkeep") - const upkeepBeacon = await upgrades.deployBeacon(upkeepBeaconFactory) - await upkeepBeacon.deployed() - - const viewsBeaconFactory = await ethers.getContractFactory("CasimirViews") - const viewsBeacon = await upgrades.deployBeacon(viewsBeaconFactory) - await viewsBeacon.deployed() - - const factoryFactory = await ethers.getContractFactory("CasimirFactory", { - libraries: { - CasimirBeacon: beaconLibrary.address - } - }) - const factory = await upgrades.deployProxy(factoryFactory, undefined, { - constructorArgs: [ - managerBeacon.address, - poolBeacon.address, - registryBeacon.address, - upkeepBeacon.address, - viewsBeacon.address - ], - unsafeAllow: ["external-library-linking"] - }) as CasimirFactory - await factory.deployed() - - const simpleStrategy = { - minCollateral: ethers.utils.parseEther("1.0"), - lockPeriod: 0, - userFee: 5, - compoundStake: true, - eigenStake: false, - liquidStake: false, - privateOperators: false, - verifiedOperators: false - } - const deploySimpleManager = await factory.deployManager( - daoOracle.address, - functionsOracle.address, - simpleStrategy - ) - await deploySimpleManager.wait() - const [managerId] = await factory.getManagerIds() - const [managerAddress, - registryAddress, - upkeepAddress, - viewsAddress] = await factory.getManagerConfig(managerId) - const manager = await ethers.getContractAt("CasimirManager", managerAddress) as CasimirManager - const registry = await ethers.getContractAt("CasimirRegistry", registryAddress) as CasimirRegistry - const upkeep = await ethers.getContractAt("CasimirUpkeep", upkeepAddress) as CasimirUpkeep - const views = await ethers.getContractAt("CasimirViews", viewsAddress) as CasimirViews - - requestConfig.args[1] = viewsAddress - const fulfillGasLimit = 300000 - const setRequest = await upkeep.setFunctionsRequest(requestConfig.source, requestConfig.args, fulfillGasLimit) - await setRequest.wait() - - await functionsBillingRegistry.setAuthorizedSenders([donTransmitter.address, functionsOracle.address]) - await functionsOracle.setRegistry(functionsBillingRegistry.address) - await functionsOracle.setAuthorizedSenders([donTransmitter.address, - manager.address, - upkeep.address]) - - const ssvViews = await ethers.getContractAt(ISSVViewsAbi, process.env.SSV_VIEWS_ADDRESS as string) as ISSVViews - - return { - managerBeacon, - poolBeacon, - registryBeacon, - upkeepBeacon, - viewsBeacon, - factory, - manager, - registry, - upkeep, - views, - functionsBillingRegistry, - functionsOracle, - ssvViews, - daoOracle, - donTransmitter - } + ] + }) + await registryBeacon.deployed() + + const upkeepBeaconFactory = await ethers.getContractFactory("CasimirUpkeep") + const upkeepBeacon = await upgrades.deployBeacon(upkeepBeaconFactory) + await upkeepBeacon.deployed() + + const viewsBeaconFactory = await ethers.getContractFactory("CasimirViews") + const viewsBeacon = await upgrades.deployBeacon(viewsBeaconFactory) + await viewsBeacon.deployed() + + const factoryFactory = await ethers.getContractFactory("CasimirFactory", { + libraries: { + CasimirBeacon: beaconLibrary.address + } + }) + const factory = await upgrades.deployProxy(factoryFactory, undefined, { + constructorArgs: [ + managerBeacon.address, + poolBeacon.address, + registryBeacon.address, + upkeepBeacon.address, + viewsBeacon.address + ], + unsafeAllow: ["external-library-linking"] + }) as CasimirFactory + await factory.deployed() + + const simpleStrategy = { + minCollateral: ethers.utils.parseEther("1.0"), + lockPeriod: 0, + userFee: 5, + compoundStake: true, + eigenStake: false, + liquidStake: false, + privateOperators: false, + verifiedOperators: false + } + const deploySimpleManager = await factory.deployManager( + daoOracle.address, + functionsOracle.address, + simpleStrategy + ) + await deploySimpleManager.wait() + const [managerId] = await factory.getManagerIds() + const [managerAddress, + registryAddress, + upkeepAddress, + viewsAddress] = await factory.getManagerConfig(managerId) + const manager = await ethers.getContractAt("CasimirManager", managerAddress) as CasimirManager + const registry = await ethers.getContractAt("CasimirRegistry", registryAddress) as CasimirRegistry + const upkeep = await ethers.getContractAt("CasimirUpkeep", upkeepAddress) as CasimirUpkeep + const views = await ethers.getContractAt("CasimirViews", viewsAddress) as CasimirViews + + requestConfig.args[1] = viewsAddress + const fulfillGasLimit = 300000 + const setRequest = await upkeep.setFunctionsRequest(requestConfig.source, requestConfig.args, fulfillGasLimit) + await setRequest.wait() + + await functionsBillingRegistry.setAuthorizedSenders([donTransmitter.address, functionsOracle.address]) + await functionsOracle.setRegistry(functionsBillingRegistry.address) + await functionsOracle.setAuthorizedSenders([donTransmitter.address, + manager.address, + upkeep.address]) + + const ssvViews = await ethers.getContractAt(ISSVViewsAbi, process.env.SSV_VIEWS_ADDRESS as string) as ISSVViews + + return { + managerBeacon, + poolBeacon, + registryBeacon, + upkeepBeacon, + viewsBeacon, + factory, + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + functionsOracle, + ssvViews, + daoOracle, + donTransmitter + } } /** Fixture to preregister operators */ export async function preregistrationFixture() { - const { - managerBeacon, - poolBeacon, - registryBeacon, - upkeepBeacon, - viewsBeacon, - factory, - manager, - registry, - upkeep, - views, - functionsBillingRegistry, - functionsOracle, - ssvViews, - daoOracle, - donTransmitter - } = await loadFixture(deploymentFixture) - - const preregisteredOperatorIds = process.env.PREREGISTERED_OPERATOR_IDS?.split(",").map(id => parseInt(id)) || [208, - 209, - 210, - 211/*, 212, 213, 214, 215*/] - if (preregisteredOperatorIds.length < 4) throw new Error("Not enough operator ids provided") - const preregisteredBalance = ethers.utils.parseEther("10") - for (const operatorId of preregisteredOperatorIds) { - const [operatorOwnerAddress] = await ssvViews.getOperatorById(operatorId) - const operatorOwnerSigner = ethers.provider.getSigner(operatorOwnerAddress) - const currentBalance = await ethers.provider.getBalance(operatorOwnerAddress) - const nextBalance = currentBalance.add(preregisteredBalance) - await setBalance(operatorOwnerAddress, nextBalance) - await network.provider.request({ - method: "hardhat_impersonateAccount", - params: [operatorOwnerAddress] - }) - const result = await registry.connect(operatorOwnerSigner).registerOperator(operatorId, { value: preregisteredBalance }) - await result.wait() - } - - return { - managerBeacon, - poolBeacon, - registryBeacon, - upkeepBeacon, - viewsBeacon, - factory, - manager, - registry, - upkeep, - views, - functionsBillingRegistry, - functionsOracle, - ssvViews, - daoOracle, - donTransmitter - } + const { + managerBeacon, + poolBeacon, + registryBeacon, + upkeepBeacon, + viewsBeacon, + factory, + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + functionsOracle, + ssvViews, + daoOracle, + donTransmitter + } = await loadFixture(deploymentFixture) + + const preregisteredOperatorIds = process.env.PREREGISTERED_OPERATOR_IDS?.split(",").map(id => parseInt(id)) || [208, + 209, + 210, + 211/*, 212, 213, 214, 215*/] + if (preregisteredOperatorIds.length < 4) throw new Error("Not enough operator ids provided") + const preregisteredBalance = ethers.utils.parseEther("10") + for (const operatorId of preregisteredOperatorIds) { + const [operatorOwnerAddress] = await ssvViews.getOperatorById(operatorId) + const operatorOwnerSigner = ethers.provider.getSigner(operatorOwnerAddress) + const currentBalance = await ethers.provider.getBalance(operatorOwnerAddress) + const nextBalance = currentBalance.add(preregisteredBalance) + await setBalance(operatorOwnerAddress, nextBalance) + await network.provider.request({ + method: "hardhat_impersonateAccount", + params: [operatorOwnerAddress] + }) + const result = + await registry.connect(operatorOwnerSigner).registerOperator(operatorId, { value: preregisteredBalance }) + await result.wait() + } + + return { + managerBeacon, + poolBeacon, + registryBeacon, + upkeepBeacon, + viewsBeacon, + factory, + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + functionsOracle, + ssvViews, + daoOracle, + donTransmitter + } } /** Fixture to stake 16 for the first user */ export async function firstUserDepositFixture() { - const { manager, - registry, - upkeep, - views, - functionsBillingRegistry, - ssvViews, - daoOracle, - donTransmitter - } = await loadFixture(preregistrationFixture) - const [, , , firstUser] = await ethers.getSigners() - - const depositAmount = round(16 * ((100 + await manager.userFee()) / 100), 10) - const deposit = await manager.connect(firstUser).depositStake({ value: ethers.utils.parseEther(depositAmount.toString()) }) - await deposit.wait() - - return { manager, registry, upkeep, views, functionsBillingRegistry, ssvViews, daoOracle, donTransmitter, firstUser } + const { manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter + } = await loadFixture(preregistrationFixture) + const [, , , firstUser] = await ethers.getSigners() + + const depositAmount = round(16 * ((100 + await manager.userFee()) / 100), 10) + const deposit = + await manager.connect(firstUser).depositStake({ value: ethers.utils.parseEther(depositAmount.toString()) }) + await deposit.wait() + + return { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser + } } /** Fixture to stake 24 for the second user */ export async function secondUserDepositFixture() { - const { manager, - registry, - upkeep, - views, - functionsBillingRegistry, - ssvViews, - daoOracle, - donTransmitter, - firstUser - } = await loadFixture(firstUserDepositFixture) - const [, , , , secondUser] = await ethers.getSigners() - - const depositAmount = round(24 * ((100 + await manager.userFee()) / 100), 10) - const deposit = await manager.connect(secondUser).depositStake({ value: ethers.utils.parseEther(depositAmount.toString()) }) - await deposit.wait() - - await depositFunctionsBalanceHandler({ manager, signer: daoOracle }) - await depositUpkeepBalanceHandler({ manager, signer: daoOracle }) - - await initiatePoolHandler({ manager, signer: daoOracle }) - - await time.increase(time.duration.days(1)) - await runUpkeep({ donTransmitter, upkeep }) - - const reportValues = { - beaconBalance: 32, - sweptBalance: 0, - activatedDeposits: 1, - forcedExits: 0, - completedExits: 0, - compoundablePoolIds: [0, - 0, - 0, - 0, - 0] - } - - await fulfillReport({ - donTransmitter, - upkeep, - functionsBillingRegistry, - values: reportValues - }) - - await activatePoolsHandler({ manager, views, signer: daoOracle, args: { count: 1 } }) - - await runUpkeep({ donTransmitter, upkeep }) - - return { manager, registry, upkeep, views, functionsBillingRegistry, ssvViews, daoOracle, donTransmitter, firstUser, secondUser } + const { manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser + } = await loadFixture(firstUserDepositFixture) + const [, , , , secondUser] = await ethers.getSigners() + + const depositAmount = round(24 * ((100 + await manager.userFee()) / 100), 10) + const deposit = + await manager.connect(secondUser).depositStake({ value: ethers.utils.parseEther(depositAmount.toString()) }) + await deposit.wait() + + await depositFunctionsBalanceHandler({ manager, signer: daoOracle }) + await depositUpkeepBalanceHandler({ manager, signer: daoOracle }) + + await initiatePoolHandler({ manager, signer: daoOracle }) + + await time.increase(time.duration.days(1)) + await runUpkeep({ donTransmitter, upkeep }) + + const reportValues = { + beaconBalance: 32, + sweptBalance: 0, + activatedDeposits: 1, + forcedExits: 0, + completedExits: 0, + compoundablePoolIds: [0, + 0, + 0, + 0, + 0] + } + + await fulfillReport({ + donTransmitter, + upkeep, + functionsBillingRegistry, + values: reportValues + }) + + await activatePoolsHandler({ manager, views, signer: daoOracle, args: { count: 1 } }) + + await runUpkeep({ donTransmitter, upkeep }) + + return { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser + } } /** Fixture to report increase of 0.105 in total rewards before fees */ export async function rewardsPostSecondUserDepositFixture() { - const { manager, - registry, - upkeep, - views, - functionsBillingRegistry, - ssvViews, - daoOracle, - donTransmitter, - firstUser, - secondUser - } = await loadFixture(secondUserDepositFixture) - - await time.increase(time.duration.days(1)) - await runUpkeep({ donTransmitter, upkeep }) - - const reportValues = { - beaconBalance: 32.105, - sweptBalance: 0, - activatedDeposits: 0, - forcedExits: 0, - completedExits: 0, - compoundablePoolIds: [0, - 0, - 0, - 0, - 0] - } - - await fulfillReport({ - donTransmitter, - upkeep, - functionsBillingRegistry, - values: reportValues, - }) - - await runUpkeep({ donTransmitter, upkeep }) - - return { manager, registry, upkeep, views, functionsBillingRegistry, ssvViews, daoOracle, donTransmitter, firstUser, secondUser } + const { manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser + } = await loadFixture(secondUserDepositFixture) + + await time.increase(time.duration.days(1)) + await runUpkeep({ donTransmitter, upkeep }) + + const reportValues = { + beaconBalance: 32.105, + sweptBalance: 0, + activatedDeposits: 0, + forcedExits: 0, + completedExits: 0, + compoundablePoolIds: [0, + 0, + 0, + 0, + 0] + } + + await fulfillReport({ + donTransmitter, + upkeep, + functionsBillingRegistry, + values: reportValues, + }) + + await runUpkeep({ donTransmitter, upkeep }) + + return { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser + } } /** Fixture to sweep 0.105 to the manager */ export async function sweepPostSecondUserDepositFixture() { - const { - manager, - registry, - upkeep, - views, - functionsBillingRegistry, - ssvViews, - daoOracle, - donTransmitter, - firstUser, - secondUser - } = await loadFixture(secondUserDepositFixture) - - await time.increase(time.duration.days(1)) - await runUpkeep({ donTransmitter, upkeep }) - - const sweptRewards = 0.105 - const stakedPoolIds = await manager.getStakedPoolIds() - for (const poolId of stakedPoolIds) { - const poolAddress = await manager.getPoolAddress(poolId) - const poolSweptRewards = sweptRewards / stakedPoolIds.length - const currentBalance = await ethers.provider.getBalance(poolAddress) - const nextBalance = currentBalance.add(ethers.utils.parseEther(poolSweptRewards.toString())) - await setBalance(poolAddress, nextBalance) - } - const compoundablePoolIds = [1, - 0, - 0, - 0, - 0] - const reportValues = { - beaconBalance: 32, - sweptBalance: sweptRewards, - activatedDeposits: 0, - forcedExits: 0, - completedExits: 0, - compoundablePoolIds - } - - await fulfillReport({ - donTransmitter, - upkeep, - functionsBillingRegistry, - values: reportValues, - }) - - await runUpkeep({ donTransmitter, upkeep }) - - return { manager, registry, upkeep, views, functionsBillingRegistry, ssvViews, daoOracle, donTransmitter, firstUser, secondUser } + const { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser + } = await loadFixture(secondUserDepositFixture) + + await time.increase(time.duration.days(1)) + await runUpkeep({ donTransmitter, upkeep }) + + const sweptRewards = 0.105 + const stakedPoolIds = await manager.getStakedPoolIds() + for (const poolId of stakedPoolIds) { + const poolAddress = await manager.getPoolAddress(poolId) + const poolSweptRewards = sweptRewards / stakedPoolIds.length + const currentBalance = await ethers.provider.getBalance(poolAddress) + const nextBalance = currentBalance.add(ethers.utils.parseEther(poolSweptRewards.toString())) + await setBalance(poolAddress, nextBalance) + } + const compoundablePoolIds = [1, + 0, + 0, + 0, + 0] + const reportValues = { + beaconBalance: 32, + sweptBalance: sweptRewards, + activatedDeposits: 0, + forcedExits: 0, + completedExits: 0, + compoundablePoolIds + } + + await fulfillReport({ + donTransmitter, + upkeep, + functionsBillingRegistry, + values: reportValues, + }) + + await runUpkeep({ donTransmitter, upkeep }) + + return { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser + } } /** Fixture to stake 24 for the third user */ export async function thirdUserDepositFixture() { - const { - manager, - registry, - upkeep, - views, - functionsBillingRegistry, - ssvViews, - daoOracle, - donTransmitter, - firstUser, - secondUser - } = await loadFixture(sweepPostSecondUserDepositFixture) - const [, , , , , thirdUser] = await ethers.getSigners() - - const depositAmount = round(24 * ((100 + await manager.userFee()) / 100), 10) - const deposit = await manager.connect(thirdUser).depositStake({ value: ethers.utils.parseEther(depositAmount.toString()) }) - await deposit.wait() - - await initiatePoolHandler({ manager, signer: daoOracle }) - - await time.increase(time.duration.days(1)) - await runUpkeep({ donTransmitter, upkeep }) - - const reportValues = { - beaconBalance: 64, - sweptBalance: 0, - activatedDeposits: 1, - forcedExits: 0, - completedExits: 0, - compoundablePoolIds: [0, - 0, - 0, - 0, - 0] - } - - await fulfillReport({ - donTransmitter, - upkeep, - functionsBillingRegistry, - values: reportValues - }) - - await activatePoolsHandler({ manager, views, signer: daoOracle, args: { count: 1 } }) - - await runUpkeep({ donTransmitter, upkeep }) - - return { manager, registry, upkeep, views, functionsBillingRegistry, ssvViews, daoOracle, donTransmitter, firstUser, secondUser, thirdUser } + const { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser + } = await loadFixture(sweepPostSecondUserDepositFixture) + const [, , , , , thirdUser] = await ethers.getSigners() + + const depositAmount = round(24 * ((100 + await manager.userFee()) / 100), 10) + const deposit = + await manager.connect(thirdUser).depositStake({ value: ethers.utils.parseEther(depositAmount.toString()) }) + await deposit.wait() + + await initiatePoolHandler({ manager, signer: daoOracle }) + + await time.increase(time.duration.days(1)) + await runUpkeep({ donTransmitter, upkeep }) + + const reportValues = { + beaconBalance: 64, + sweptBalance: 0, + activatedDeposits: 1, + forcedExits: 0, + completedExits: 0, + compoundablePoolIds: [0, + 0, + 0, + 0, + 0] + } + + await fulfillReport({ + donTransmitter, + upkeep, + functionsBillingRegistry, + values: reportValues + }) + + await activatePoolsHandler({ manager, views, signer: daoOracle, args: { count: 1 } }) + + await runUpkeep({ donTransmitter, upkeep }) + + return { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser, + thirdUser + } } /** Fixture to report increase of 0.21 in total rewards before fees */ export async function rewardsPostThirdUserDepositFixture() { - const { manager, - registry, - upkeep, - views, - functionsBillingRegistry, - ssvViews, - daoOracle, - donTransmitter, - firstUser, - secondUser, - thirdUser - } = await loadFixture(thirdUserDepositFixture) - - await time.increase(time.duration.days(1)) - await runUpkeep({ donTransmitter, upkeep }) - - const reportValues = { - beaconBalance: 64.21, - sweptBalance: 0, - activatedDeposits: 0, - forcedExits: 0, - completedExits: 0, - compoundablePoolIds: [0, - 0, - 0, - 0, - 0] - } - - await fulfillReport({ - donTransmitter, - upkeep, - functionsBillingRegistry, - values: reportValues, - }) - - await runUpkeep({ donTransmitter, upkeep }) - - return { manager, registry, upkeep, views, functionsBillingRegistry, ssvViews, daoOracle, donTransmitter, firstUser, secondUser, thirdUser } + const { manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser, + thirdUser + } = await loadFixture(thirdUserDepositFixture) + + await time.increase(time.duration.days(1)) + await runUpkeep({ donTransmitter, upkeep }) + + const reportValues = { + beaconBalance: 64.21, + sweptBalance: 0, + activatedDeposits: 0, + forcedExits: 0, + completedExits: 0, + compoundablePoolIds: [0, + 0, + 0, + 0, + 0] + } + + await fulfillReport({ + donTransmitter, + upkeep, + functionsBillingRegistry, + values: reportValues, + }) + + await runUpkeep({ donTransmitter, upkeep }) + + return { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser, + thirdUser + } } /** Fixture to sweep 0.21 to the manager */ export async function sweepPostThirdUserDepositFixture() { - const { - manager, - registry, - upkeep, - views, - functionsBillingRegistry, - ssvViews, - daoOracle, - donTransmitter, - firstUser, - secondUser, - thirdUser - } = await loadFixture(rewardsPostThirdUserDepositFixture) - - await time.increase(time.duration.days(1)) - await runUpkeep({ donTransmitter, upkeep }) - - const sweptRewards = 0.21 - const stakedPoolIds = await manager.getStakedPoolIds() - for (const poolId of stakedPoolIds) { - const poolAddress = await manager.getPoolAddress(poolId) - const poolSweptRewards = sweptRewards / stakedPoolIds.length - const currentBalance = await ethers.provider.getBalance(poolAddress) - const nextBalance = currentBalance.add(ethers.utils.parseEther(poolSweptRewards.toString())) - await setBalance(poolAddress, nextBalance) - } - const compoundablePoolIds = [1, - 2, - 0, - 0, - 0] - const reportValues = { - beaconBalance: 64, - sweptBalance: sweptRewards, - activatedDeposits: 0, - forcedExits: 0, - completedExits: 0, - compoundablePoolIds - } - - await fulfillReport({ - donTransmitter, - upkeep, - functionsBillingRegistry, - values: reportValues - }) - - await runUpkeep({ donTransmitter, upkeep }) - - return { manager, registry, upkeep, views, functionsBillingRegistry, ssvViews, daoOracle, donTransmitter, firstUser, secondUser, thirdUser } + const { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser, + thirdUser + } = await loadFixture(rewardsPostThirdUserDepositFixture) + + await time.increase(time.duration.days(1)) + await runUpkeep({ donTransmitter, upkeep }) + + const sweptRewards = 0.21 + const stakedPoolIds = await manager.getStakedPoolIds() + for (const poolId of stakedPoolIds) { + const poolAddress = await manager.getPoolAddress(poolId) + const poolSweptRewards = sweptRewards / stakedPoolIds.length + const currentBalance = await ethers.provider.getBalance(poolAddress) + const nextBalance = currentBalance.add(ethers.utils.parseEther(poolSweptRewards.toString())) + await setBalance(poolAddress, nextBalance) + } + const compoundablePoolIds = [1, + 2, + 0, + 0, + 0] + const reportValues = { + beaconBalance: 64, + sweptBalance: sweptRewards, + activatedDeposits: 0, + forcedExits: 0, + completedExits: 0, + compoundablePoolIds + } + + await fulfillReport({ + donTransmitter, + upkeep, + functionsBillingRegistry, + values: reportValues + }) + + await runUpkeep({ donTransmitter, upkeep }) + + return { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser, + thirdUser + } } /** Fixture to partial withdraw 0.3 to the first user */ export async function firstUserPartialWithdrawalFixture() { - const { - manager, - registry, - upkeep, - views, - functionsBillingRegistry, - ssvViews, - daoOracle, - donTransmitter, - firstUser, - secondUser, - thirdUser - } = await loadFixture(sweepPostThirdUserDepositFixture) - const withdrawableBalance = await manager.getWithdrawableBalance() - const withdraw = await manager.connect(firstUser).requestWithdrawal(withdrawableBalance) - await withdraw.wait() - - await time.increase(time.duration.days(1)) - await runUpkeep({ donTransmitter, upkeep }) - - const reportValues = { - beaconBalance: 64, - sweptBalance: 0, - activatedDeposits: 0, - forcedExits: 0, - completedExits: 0, - compoundablePoolIds: [0, - 0, - 0, - 0, - 0] - } - - await fulfillReport({ - donTransmitter, - upkeep, - functionsBillingRegistry, - values: reportValues - }) - - await runUpkeep({ donTransmitter, upkeep }) - - return { manager, registry, upkeep, views, functionsBillingRegistry, ssvViews, daoOracle, donTransmitter, firstUser, secondUser, thirdUser } + const { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser, + thirdUser + } = await loadFixture(sweepPostThirdUserDepositFixture) + const withdrawableBalance = await manager.getWithdrawableBalance() + const withdraw = await manager.connect(firstUser).requestWithdrawal(withdrawableBalance) + await withdraw.wait() + + await time.increase(time.duration.days(1)) + await runUpkeep({ donTransmitter, upkeep }) + + const reportValues = { + beaconBalance: 64, + sweptBalance: 0, + activatedDeposits: 0, + forcedExits: 0, + completedExits: 0, + compoundablePoolIds: [0, + 0, + 0, + 0, + 0] + } + + await fulfillReport({ + donTransmitter, + upkeep, + functionsBillingRegistry, + values: reportValues + }) + + await runUpkeep({ donTransmitter, upkeep }) + + return { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser, + thirdUser + } } /** Fixture to stake 72 for the fourth user */ export async function fourthUserDepositFixture() { - const { manager, - registry, - upkeep, - views, - functionsBillingRegistry, - ssvViews, - daoOracle, - donTransmitter, - firstUser, - secondUser, - thirdUser - } = await loadFixture(firstUserPartialWithdrawalFixture) - const [, , , , , , fourthUser] = await ethers.getSigners() - - const depositAmount = round(72 * ((100 + await manager.userFee()) / 100), 10) - const deposit = await manager.connect(fourthUser).depositStake({ value: ethers.utils.parseEther(depositAmount.toString()) }) - await deposit.wait() - - for (let i = 0; i < 2; i++) { - await initiatePoolHandler({ manager, signer: daoOracle }) - } - - await time.increase(time.duration.days(1)) - await runUpkeep({ donTransmitter, upkeep }) - - const reportValues = { - beaconBalance: 128, - sweptBalance: 0, - activatedDeposits: 2, - forcedExits: 0, - completedExits: 0, - compoundablePoolIds: [0, - 0, - 0, - 0, - 0] - } - - await fulfillReport({ - donTransmitter, - upkeep, - functionsBillingRegistry, - values: reportValues - }) - - await activatePoolsHandler({ manager, views, signer: daoOracle, args: { count: 2 } }) - - await runUpkeep({ donTransmitter, upkeep }) - - return { - manager, registry, upkeep, views, functionsBillingRegistry, ssvViews, daoOracle, donTransmitter, firstUser, secondUser, thirdUser, fourthUser - } + const { manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser, + thirdUser + } = await loadFixture(firstUserPartialWithdrawalFixture) + const [, , , , , , fourthUser] = await ethers.getSigners() + + const depositAmount = round(72 * ((100 + await manager.userFee()) / 100), 10) + const deposit = + await manager.connect(fourthUser).depositStake({ value: ethers.utils.parseEther(depositAmount.toString()) }) + await deposit.wait() + + for (let i = 0; i < 2; i++) { + await initiatePoolHandler({ manager, signer: daoOracle }) + } + + await time.increase(time.duration.days(1)) + await runUpkeep({ donTransmitter, upkeep }) + + const reportValues = { + beaconBalance: 128, + sweptBalance: 0, + activatedDeposits: 2, + forcedExits: 0, + completedExits: 0, + compoundablePoolIds: [0, + 0, + 0, + 0, + 0] + } + + await fulfillReport({ + donTransmitter, + upkeep, + functionsBillingRegistry, + values: reportValues + }) + + await activatePoolsHandler({ manager, views, signer: daoOracle, args: { count: 2 } }) + + await runUpkeep({ donTransmitter, upkeep }) + + return { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser, + thirdUser, + fourthUser + } } /** Fixture to simulate a validator stake penalty that decreases the beacon chain balance */ export async function beaconBalanceLossFixture() { - const { - manager, - registry, - upkeep, - views, - functionsBillingRegistry, - ssvViews, - daoOracle, - donTransmitter, - firstUser, - secondUser, - thirdUser, - fourthUser - } = await loadFixture(fourthUserDepositFixture) - - await time.increase(time.duration.days(1)) - await runUpkeep({ donTransmitter, upkeep }) - - const reportValues = { - beaconBalance: 126, - sweptBalance: 0, - activatedDeposits: 0, - forcedExits: 0, - completedExits: 0, - compoundablePoolIds: [0, - 0, - 0, - 0, - 0] - } - - await fulfillReport({ - donTransmitter, - upkeep, - functionsBillingRegistry, - values: reportValues - }) - - await runUpkeep({ donTransmitter, upkeep }) - - return { - manager, registry, upkeep, views, functionsBillingRegistry, ssvViews, daoOracle, donTransmitter, firstUser, secondUser, thirdUser, fourthUser - } -} + const { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser, + thirdUser, + fourthUser + } = await loadFixture(fourthUserDepositFixture) -/** Fixture to simulate a validator reward that brings the beacon chain balance back to expected */ -export async function beaconBalanceRecoveryFixture() { - const { - manager, - registry, - upkeep, - views, - functionsBillingRegistry, - ssvViews, - daoOracle, - donTransmitter, - firstUser, - secondUser, - thirdUser, - fourthUser - } = await loadFixture(beaconBalanceLossFixture) - - let nextBeaconBalance = 127 - for (let i = 0; i < 2; i++) { await time.increase(time.duration.days(1)) await runUpkeep({ donTransmitter, upkeep }) const reportValues = { - beaconBalance: nextBeaconBalance, - sweptBalance: 0, - activatedDeposits: 0, - forcedExits: 0, - completedExits: 0, - compoundablePoolIds: [0, - 0, - 0, - 0, - 0] + beaconBalance: 126, + sweptBalance: 0, + activatedDeposits: 0, + forcedExits: 0, + completedExits: 0, + compoundablePoolIds: [0, + 0, + 0, + 0, + 0] } await fulfillReport({ - donTransmitter, - upkeep, - functionsBillingRegistry, - values: reportValues + donTransmitter, + upkeep, + functionsBillingRegistry, + values: reportValues }) await runUpkeep({ donTransmitter, upkeep }) - nextBeaconBalance += 1 - } - return { - manager, registry, upkeep, views, functionsBillingRegistry, ssvViews, daoOracle, donTransmitter, firstUser, secondUser, thirdUser, fourthUser - } + return { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser, + thirdUser, + fourthUser + } +} + +/** Fixture to simulate a validator reward that brings the beacon chain balance back to expected */ +export async function beaconBalanceRecoveryFixture() { + const { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser, + thirdUser, + fourthUser + } = await loadFixture(beaconBalanceLossFixture) + + let nextBeaconBalance = 127 + for (let i = 0; i < 2; i++) { + await time.increase(time.duration.days(1)) + await runUpkeep({ donTransmitter, upkeep }) + + const reportValues = { + beaconBalance: nextBeaconBalance, + sweptBalance: 0, + activatedDeposits: 0, + forcedExits: 0, + completedExits: 0, + compoundablePoolIds: [0, + 0, + 0, + 0, + 0] + } + + await fulfillReport({ + donTransmitter, + upkeep, + functionsBillingRegistry, + values: reportValues + }) + + await runUpkeep({ donTransmitter, upkeep }) + nextBeaconBalance += 1 + } + + return { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser, + thirdUser, + fourthUser + } } /** Fixture to full withdraw ~24.07 */ export async function thirdUserFullWithdrawalFixture() { - const { - manager, - registry, - upkeep, - views, - functionsBillingRegistry, - ssvViews, - daoOracle, - donTransmitter, - firstUser, - secondUser, - thirdUser, - fourthUser - } = await loadFixture(beaconBalanceRecoveryFixture) - - const thirdStake = await manager.getUserStake(thirdUser.address) - const withdraw = await manager.connect(thirdUser).requestWithdrawal(thirdStake) - await withdraw.wait() - - await time.increase(time.duration.days(1)) - await runUpkeep({ donTransmitter, upkeep }) - - const sweptExitedBalance = 32 - const reportValues = { - beaconBalance: 96, - sweptBalance: sweptExitedBalance, - activatedDeposits: 0, - forcedExits: 0, - completedExits: 1, - compoundablePoolIds: [0, - 0, - 0, - 0, - 0] - } - - await fulfillReport({ - donTransmitter, - upkeep, - functionsBillingRegistry, - values: reportValues - }) - - const exitedPoolId = (await manager.getStakedPoolIds())[0] - const exitedPoolAddress = await manager.getPoolAddress(exitedPoolId) - const currentBalance = await ethers.provider.getBalance(exitedPoolAddress) - const nextBalance = currentBalance.add(ethers.utils.parseEther(sweptExitedBalance.toString())) - await setBalance(exitedPoolAddress, nextBalance) - - await reportCompletedExitsHandler({ manager, views, signer: daoOracle, args: { count: 1 } }) - - await runUpkeep({ donTransmitter, upkeep }) - - return { - manager, registry, upkeep, views, functionsBillingRegistry, ssvViews, daoOracle, donTransmitter, firstUser, secondUser, thirdUser, fourthUser - } + const { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser, + thirdUser, + fourthUser + } = await loadFixture(beaconBalanceRecoveryFixture) + + const thirdStake = await manager.getUserStake(thirdUser.address) + const withdraw = await manager.connect(thirdUser).requestWithdrawal(thirdStake) + await withdraw.wait() + + await time.increase(time.duration.days(1)) + await runUpkeep({ donTransmitter, upkeep }) + + const sweptExitedBalance = 32 + const reportValues = { + beaconBalance: 96, + sweptBalance: sweptExitedBalance, + activatedDeposits: 0, + forcedExits: 0, + completedExits: 1, + compoundablePoolIds: [0, + 0, + 0, + 0, + 0] + } + + await fulfillReport({ + donTransmitter, + upkeep, + functionsBillingRegistry, + values: reportValues + }) + + const exitedPoolId = (await manager.getStakedPoolIds())[0] + const exitedPoolAddress = await manager.getPoolAddress(exitedPoolId) + const currentBalance = await ethers.provider.getBalance(exitedPoolAddress) + const nextBalance = currentBalance.add(ethers.utils.parseEther(sweptExitedBalance.toString())) + await setBalance(exitedPoolAddress, nextBalance) + + await reportCompletedExitsHandler({ manager, views, signer: daoOracle, args: { count: 1 } }) + + await runUpkeep({ donTransmitter, upkeep }) + + return { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser, + thirdUser, + fourthUser + } } /** Fixture to simulate rewards */ export async function simulationFixture() { - const { - manager, - registry, - upkeep, - views, - functionsBillingRegistry, - ssvViews, - daoOracle, - donTransmitter, - firstUser, - secondUser, - thirdUser, - fourthUser - } = await loadFixture(thirdUserFullWithdrawalFixture) - - const rewardsPerValidator = 0.105 - let nextBeaconBalance = 96 - let totalRewards = 0 - for (let i = 0; i < 5; i++) { + const { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser, + thirdUser, + fourthUser + } = await loadFixture(thirdUserFullWithdrawalFixture) + + const rewardsPerValidator = 0.105 + let nextBeaconBalance = 96 + let totalRewards = 0 + for (let i = 0; i < 5; i++) { + await time.increase(time.duration.days(1)) + await runUpkeep({ donTransmitter, upkeep }) + + const stakedPoolIds = await manager.getStakedPoolIds() + const rewardsAmount = rewardsPerValidator * stakedPoolIds.length + totalRewards += round(rewardsAmount, 10) + nextBeaconBalance = round(nextBeaconBalance + rewardsAmount, 10) + const reportValues = { + beaconBalance: nextBeaconBalance, + sweptBalance: 0, + activatedDeposits: 0, + forcedExits: 0, + completedExits: 0, + compoundablePoolIds: [0, + 0, + 0, + 0, + 0] + } + + await fulfillReport({ + donTransmitter, + upkeep, + functionsBillingRegistry, + values: reportValues + }) + + await runUpkeep({ donTransmitter, upkeep }) + } + + const sweptRewards = totalRewards + const stakedPoolIds = await manager.getStakedPoolIds() + await time.increase(time.duration.days(1)) await runUpkeep({ donTransmitter, upkeep }) - const stakedPoolIds = await manager.getStakedPoolIds() - const rewardsAmount = rewardsPerValidator * stakedPoolIds.length - totalRewards += round(rewardsAmount, 10) - nextBeaconBalance = round(nextBeaconBalance + rewardsAmount, 10) - const reportValues = { - beaconBalance: nextBeaconBalance, - sweptBalance: 0, - activatedDeposits: 0, - forcedExits: 0, - completedExits: 0, - compoundablePoolIds: [0, - 0, - 0, + for (const poolId of stakedPoolIds) { + const poolAddress = await manager.getPoolAddress(poolId) + const poolSweptRewards = sweptRewards / stakedPoolIds.length + const currentBalance = await ethers.provider.getBalance(poolAddress) + const nextBalance = currentBalance.add(ethers.utils.parseEther(poolSweptRewards.toString())) + await setBalance(poolAddress, nextBalance) + } + const compoundablePoolIds = [2, + 3, + 4, 0, 0] + const reportValues = { + beaconBalance: 96, + sweptBalance: sweptRewards, + activatedDeposits: 0, + forcedExits: 0, + completedExits: 0, + compoundablePoolIds } await fulfillReport({ - donTransmitter, - upkeep, - functionsBillingRegistry, - values: reportValues + donTransmitter, + upkeep, + functionsBillingRegistry, + values: reportValues }) await runUpkeep({ donTransmitter, upkeep }) - } - - const sweptRewards = totalRewards - const stakedPoolIds = await manager.getStakedPoolIds() - - await time.increase(time.duration.days(1)) - await runUpkeep({ donTransmitter, upkeep }) - - for (const poolId of stakedPoolIds) { - const poolAddress = await manager.getPoolAddress(poolId) - const poolSweptRewards = sweptRewards / stakedPoolIds.length - const currentBalance = await ethers.provider.getBalance(poolAddress) - const nextBalance = currentBalance.add(ethers.utils.parseEther(poolSweptRewards.toString())) - await setBalance(poolAddress, nextBalance) - } - const compoundablePoolIds = [2, - 3, - 4, - 0, - 0] - const reportValues = { - beaconBalance: 96, - sweptBalance: sweptRewards, - activatedDeposits: 0, - forcedExits: 0, - completedExits: 0, - compoundablePoolIds - } - - await fulfillReport({ - donTransmitter, - upkeep, - functionsBillingRegistry, - values: reportValues - }) - - await runUpkeep({ donTransmitter, upkeep }) - - return { - manager, registry, upkeep, views, functionsBillingRegistry, ssvViews, daoOracle, donTransmitter, firstUser, secondUser, thirdUser, fourthUser - } + + return { + manager, + registry, + upkeep, + views, + functionsBillingRegistry, + ssvViews, + daoOracle, + donTransmitter, + firstUser, + secondUser, + thirdUser, + fourthUser + } } \ No newline at end of file diff --git a/contracts/ethereum/test/integration.ts b/contracts/ethereum/test/integration.ts index 7505cbb38..a74794521 100644 --- a/contracts/ethereum/test/integration.ts +++ b/contracts/ethereum/test/integration.ts @@ -5,182 +5,183 @@ import { firstUserDepositFixture, rewardsPostSecondUserDepositFixture, secondUse describe("Integration", async function () { - it("First user's 16.0 stake increases the total stake to 16.0", async function () { - const { manager } = await loadFixture(firstUserDepositFixture) - const stake = await manager.getTotalStake() - expect(ethers.utils.formatEther(stake)).equal("16.0") - }) - - it("First user's 16.0 stake increases their stake to 16.0", async function () { - const { manager, firstUser } = await loadFixture(firstUserDepositFixture) - const stake = await manager.getUserStake(firstUser.address) - expect(ethers.utils.formatEther(stake)).equal("16.0") - }) - - it("Second user's 24.0 stake completes the first pool with 32.0", async function () { - const { manager, views } = await loadFixture(secondUserDepositFixture) - const stakedPoolIds = await manager.getStakedPoolIds() - expect(stakedPoolIds.length).equal(1) - - const firstPoolId = stakedPoolIds[0] - const poolConfig = await views.getPoolConfig(firstPoolId) - expect(poolConfig.publicKey).not.equal("0x") - expect(poolConfig.operatorIds.length).equal(4) - }) - - it("Second user's 24.0 stake increases the total stake to 40.0", async function () { - const { manager } = await loadFixture(secondUserDepositFixture) - const stake = await manager.getTotalStake() - expect(ethers.utils.formatEther(stake)).equal("40.0") - }) - - it("Second user's 24.0 stake increases their stake to 24.0", async function () { - const { manager, secondUser } = await loadFixture(secondUserDepositFixture) - const stake = await manager.getUserStake(secondUser.address) - expect(ethers.utils.formatEther(stake)).equal("24.0") - }) - - it("Functions oracle reports an increase of 0.1 in total after fees", async function () { - const { manager } = await loadFixture(rewardsPostSecondUserDepositFixture) - const stake = await manager.getTotalStake() - expect(ethers.utils.formatEther(stake)).equal("40.1") - }) - - it("First and second user's stake earns them 0.04 and 0.06", async function () { - const { manager, firstUser, secondUser } = await loadFixture(rewardsPostSecondUserDepositFixture) - const firstStake = await manager.getUserStake(firstUser.address) - const secondStake = await manager.getUserStake(secondUser.address) - expect(ethers.utils.formatEther(firstStake)).equal("16.04") - expect(ethers.utils.formatEther(secondStake)).equal("24.06") - }) - - it("First pool's 0.1 is swept and compounded", async function () { - const { manager } = await loadFixture(sweepPostSecondUserDepositFixture) - const withdrawableBalance = await manager.getWithdrawableBalance() - expect(ethers.utils.formatEther(withdrawableBalance)).equal("8.1") - }) - - it("Third user's 24.0 stake completes the second pool with 32.0", async function () { - const { manager, views } = await loadFixture(thirdUserDepositFixture) - const stakedPools = await manager.getStakedPoolIds() - expect(stakedPools.length).equal(2) - - const secondPoolId = stakedPools[1] - const poolConfig = await views.getPoolConfig(secondPoolId) - expect(poolConfig.publicKey).not.equal("0x") - expect(poolConfig.operatorIds.length).equal(4) - }) - - it("Third user's 24.0 stake increases the total stake to 64.1", async function () { - const { manager } = await loadFixture(thirdUserDepositFixture) - const stake = await manager.getTotalStake() - expect(ethers.utils.formatEther(stake)).equal("64.1") - }) - - it("Third user's 24.0 stake increases their stake to 24.0", async function () { - const { manager, thirdUser } = await loadFixture(thirdUserDepositFixture) - const stake = await manager.getUserStake(thirdUser.address) - expect(ethers.utils.formatEther(stake)).equal("24.0") - }) - - it("Functions oracle reports an increase of 0.2 in total after fees", async function () { - const { manager } = await loadFixture(rewardsPostThirdUserDepositFixture) - const stake = await manager.getTotalStake() - expect(ethers.utils.formatEther(stake)).equal("64.3") - }) - - it("First, second, and third user's stake earns them ~0.09, ~0.135 and ~0.075", async function () { - const { manager, firstUser, secondUser, thirdUser } = await loadFixture(rewardsPostThirdUserDepositFixture) - const firstStake = await manager.getUserStake(firstUser.address) - const secondStake = await manager.getUserStake(secondUser.address) - const thirdStake = await manager.getUserStake(thirdUser.address) - - expect(ethers.utils.formatEther(firstStake)).equal("16.090046801872074882") - expect(ethers.utils.formatEther(secondStake)).equal("24.135070202808112324") - expect(ethers.utils.formatEther(thirdStake)).equal("24.074882995319812792") - }) - - it("First and second pool's 0.2 is swept and compounded", async function () { - const { manager } = await loadFixture(sweepPostThirdUserDepositFixture) - const withdrawableBalance = await manager.getWithdrawableBalance() - expect(ethers.utils.formatEther(withdrawableBalance)).equal("0.3") - }) - - it("First user's 0.3 withdrawal decreases their stake to ~15.79", async function () { - const { manager, firstUser, secondUser, thirdUser } = await loadFixture(firstUserPartialWithdrawalFixture) - const firstStake = await manager.getUserStake(firstUser.address) - const secondStake = await manager.getUserStake(secondUser.address) - const thirdStake = await manager.getUserStake(thirdUser.address) - - expect(ethers.utils.formatEther(firstStake)).equal("15.790046801872074882") - expect(ethers.utils.formatEther(secondStake)).equal("24.135070202808112324") - expect(ethers.utils.formatEther(thirdStake)).equal("24.074882995319812792") - }) - - it("Fourth user's 72 stake completes the third and fourth pool with 72", async function () { - const { manager, views } = await loadFixture(fourthUserDepositFixture) - const stakedPools = await manager.getStakedPoolIds() - expect(stakedPools.length).equal(4) - - const thirdPoolId = stakedPools[2] - const thirdPoolConfig = await views.getPoolConfig(thirdPoolId) - expect(thirdPoolConfig.publicKey).not.equal("0x") - expect(thirdPoolConfig.operatorIds.length).equal(4) - - const fourthPoolId = stakedPools[3] - const fourthPoolConfig = await views.getPoolConfig(fourthPoolId) - expect(fourthPoolConfig.publicKey).not.equal("0x") - expect(fourthPoolConfig.operatorIds.length).equal(4) - }) - - it("A loss is reported and brings the active stake below expected", async function () { - const { manager } = await loadFixture(beaconBalanceLossFixture) - const beaconBalance = await manager.latestBeaconBalance() - expect(ethers.utils.formatEther(beaconBalance)).equal("126.0") - }) - - it("Gains are reported and bring the active stake back to expected", async function () { - const { manager } = await loadFixture(beaconBalanceRecoveryFixture) - const beaconBalance = await manager.latestBeaconBalance() - expect(ethers.utils.formatEther(beaconBalance)).equal("128.0") - }) - - it("Third user full withdrawal is completed on exit report", async function () { - const { manager, firstUser, secondUser, thirdUser, fourthUser } = await loadFixture(thirdUserFullWithdrawalFixture) - const stake = await manager.getTotalStake() - const firstStake = await manager.getUserStake(firstUser.address) - const secondStake = await manager.getUserStake(secondUser.address) - const thirdStake = await manager.getUserStake(thirdUser.address) - const fourthStake = await manager.getUserStake(fourthUser.address) - - expect(ethers.utils.formatEther(stake)).equal("111.925117004680187208") - expect(ethers.utils.formatEther(firstStake)).equal("15.790046801872074882") - expect(ethers.utils.formatEther(secondStake)).equal("24.135070202808112324") - expect(ethers.utils.formatEther(thirdStake)).equal("0.0") - expect(ethers.utils.formatEther(fourthStake)).equal("72.0") - }) - - it("Check more rewards and dust", async function () { - const { manager, firstUser, secondUser, thirdUser, fourthUser } = await loadFixture(simulationFixture) - const stake = await manager.getTotalStake() - const firstStake = await manager.getUserStake(firstUser.address) - const secondStake = await manager.getUserStake(secondUser.address) - const thirdStake = await manager.getUserStake(thirdUser.address) - const fourthStake = await manager.getUserStake(fourthUser.address) - - const line = "----------------------------------------" - console.log(`${line}\n💿 Simulation results\n${line}`) - console.log("🏦 Manager stake", ethers.utils.formatEther(stake)) - console.log("👤 First user stake", ethers.utils.formatEther(firstStake)) - console.log("👤 Second user stake", ethers.utils.formatEther(secondStake)) - console.log("👤 Third user stake", ethers.utils.formatEther(thirdStake)) - console.log("👤 Fourth user stake", ethers.utils.formatEther(fourthStake)) - const withdrawableBalance = await manager.getWithdrawableBalance() - console.log("📦 Withdrawable balance", ethers.utils.formatEther(withdrawableBalance)) - const dust = stake.sub(firstStake.add(secondStake).add(thirdStake).add(fourthStake)) - if (dust !== ethers.utils.parseEther("0.0")) { - console.log("🧹 Dust", ethers.utils.formatEther(dust)) - } - console.log(line) - }) + it("First user's 16.0 stake increases the total stake to 16.0", async function () { + const { manager } = await loadFixture(firstUserDepositFixture) + const stake = await manager.getTotalStake() + expect(ethers.utils.formatEther(stake)).equal("16.0") + }) + + it("First user's 16.0 stake increases their stake to 16.0", async function () { + const { manager, firstUser } = await loadFixture(firstUserDepositFixture) + const stake = await manager.getUserStake(firstUser.address) + expect(ethers.utils.formatEther(stake)).equal("16.0") + }) + + it("Second user's 24.0 stake completes the first pool with 32.0", async function () { + const { manager, views } = await loadFixture(secondUserDepositFixture) + const stakedPoolIds = await manager.getStakedPoolIds() + expect(stakedPoolIds.length).equal(1) + + const firstPoolId = stakedPoolIds[0] + const poolConfig = await views.getPoolConfig(firstPoolId) + expect(poolConfig.publicKey).not.equal("0x") + expect(poolConfig.operatorIds.length).equal(4) + }) + + it("Second user's 24.0 stake increases the total stake to 40.0", async function () { + const { manager } = await loadFixture(secondUserDepositFixture) + const stake = await manager.getTotalStake() + expect(ethers.utils.formatEther(stake)).equal("40.0") + }) + + it("Second user's 24.0 stake increases their stake to 24.0", async function () { + const { manager, secondUser } = await loadFixture(secondUserDepositFixture) + const stake = await manager.getUserStake(secondUser.address) + expect(ethers.utils.formatEther(stake)).equal("24.0") + }) + + it("Functions oracle reports an increase of 0.1 in total after fees", async function () { + const { manager } = await loadFixture(rewardsPostSecondUserDepositFixture) + const stake = await manager.getTotalStake() + expect(ethers.utils.formatEther(stake)).equal("40.1") + }) + + it("First and second user's stake earns them 0.04 and 0.06", async function () { + const { manager, firstUser, secondUser } = await loadFixture(rewardsPostSecondUserDepositFixture) + const firstStake = await manager.getUserStake(firstUser.address) + const secondStake = await manager.getUserStake(secondUser.address) + expect(ethers.utils.formatEther(firstStake)).equal("16.04") + expect(ethers.utils.formatEther(secondStake)).equal("24.06") + }) + + it("First pool's 0.1 is swept and compounded", async function () { + const { manager } = await loadFixture(sweepPostSecondUserDepositFixture) + const withdrawableBalance = await manager.getWithdrawableBalance() + expect(ethers.utils.formatEther(withdrawableBalance)).equal("8.1") + }) + + it("Third user's 24.0 stake completes the second pool with 32.0", async function () { + const { manager, views } = await loadFixture(thirdUserDepositFixture) + const stakedPools = await manager.getStakedPoolIds() + expect(stakedPools.length).equal(2) + + const secondPoolId = stakedPools[1] + const poolConfig = await views.getPoolConfig(secondPoolId) + expect(poolConfig.publicKey).not.equal("0x") + expect(poolConfig.operatorIds.length).equal(4) + }) + + it("Third user's 24.0 stake increases the total stake to 64.1", async function () { + const { manager } = await loadFixture(thirdUserDepositFixture) + const stake = await manager.getTotalStake() + expect(ethers.utils.formatEther(stake)).equal("64.1") + }) + + it("Third user's 24.0 stake increases their stake to 24.0", async function () { + const { manager, thirdUser } = await loadFixture(thirdUserDepositFixture) + const stake = await manager.getUserStake(thirdUser.address) + expect(ethers.utils.formatEther(stake)).equal("24.0") + }) + + it("Functions oracle reports an increase of 0.2 in total after fees", async function () { + const { manager } = await loadFixture(rewardsPostThirdUserDepositFixture) + const stake = await manager.getTotalStake() + expect(ethers.utils.formatEther(stake)).equal("64.3") + }) + + it("First, second, and third user's stake earns them ~0.09, ~0.135 and ~0.075", async function () { + const { manager, firstUser, secondUser, thirdUser } = await loadFixture(rewardsPostThirdUserDepositFixture) + const firstStake = await manager.getUserStake(firstUser.address) + const secondStake = await manager.getUserStake(secondUser.address) + const thirdStake = await manager.getUserStake(thirdUser.address) + + expect(ethers.utils.formatEther(firstStake)).equal("16.090046801872074882") + expect(ethers.utils.formatEther(secondStake)).equal("24.135070202808112324") + expect(ethers.utils.formatEther(thirdStake)).equal("24.074882995319812792") + }) + + it("First and second pool's 0.2 is swept and compounded", async function () { + const { manager } = await loadFixture(sweepPostThirdUserDepositFixture) + const withdrawableBalance = await manager.getWithdrawableBalance() + expect(ethers.utils.formatEther(withdrawableBalance)).equal("0.3") + }) + + it("First user's 0.3 withdrawal decreases their stake to ~15.79", async function () { + const { manager, firstUser, secondUser, thirdUser } = await loadFixture(firstUserPartialWithdrawalFixture) + const firstStake = await manager.getUserStake(firstUser.address) + const secondStake = await manager.getUserStake(secondUser.address) + const thirdStake = await manager.getUserStake(thirdUser.address) + + expect(ethers.utils.formatEther(firstStake)).equal("15.790046801872074882") + expect(ethers.utils.formatEther(secondStake)).equal("24.135070202808112324") + expect(ethers.utils.formatEther(thirdStake)).equal("24.074882995319812792") + }) + + it("Fourth user's 72 stake completes the third and fourth pool with 72", async function () { + const { manager, views } = await loadFixture(fourthUserDepositFixture) + const stakedPools = await manager.getStakedPoolIds() + expect(stakedPools.length).equal(4) + + const thirdPoolId = stakedPools[2] + const thirdPoolConfig = await views.getPoolConfig(thirdPoolId) + expect(thirdPoolConfig.publicKey).not.equal("0x") + expect(thirdPoolConfig.operatorIds.length).equal(4) + + const fourthPoolId = stakedPools[3] + const fourthPoolConfig = await views.getPoolConfig(fourthPoolId) + expect(fourthPoolConfig.publicKey).not.equal("0x") + expect(fourthPoolConfig.operatorIds.length).equal(4) + }) + + it("A loss is reported and brings the active stake below expected", async function () { + const { manager } = await loadFixture(beaconBalanceLossFixture) + const beaconBalance = await manager.latestBeaconBalance() + expect(ethers.utils.formatEther(beaconBalance)).equal("126.0") + }) + + it("Gains are reported and bring the active stake back to expected", async function () { + const { manager } = await loadFixture(beaconBalanceRecoveryFixture) + const beaconBalance = await manager.latestBeaconBalance() + expect(ethers.utils.formatEther(beaconBalance)).equal("128.0") + }) + + it("Third user full withdrawal is completed on exit report", async function () { + const { manager, firstUser, secondUser, thirdUser, fourthUser } = + await loadFixture(thirdUserFullWithdrawalFixture) + const stake = await manager.getTotalStake() + const firstStake = await manager.getUserStake(firstUser.address) + const secondStake = await manager.getUserStake(secondUser.address) + const thirdStake = await manager.getUserStake(thirdUser.address) + const fourthStake = await manager.getUserStake(fourthUser.address) + + expect(ethers.utils.formatEther(stake)).equal("111.925117004680187208") + expect(ethers.utils.formatEther(firstStake)).equal("15.790046801872074882") + expect(ethers.utils.formatEther(secondStake)).equal("24.135070202808112324") + expect(ethers.utils.formatEther(thirdStake)).equal("0.0") + expect(ethers.utils.formatEther(fourthStake)).equal("72.0") + }) + + it("Check more rewards and dust", async function () { + const { manager, firstUser, secondUser, thirdUser, fourthUser } = await loadFixture(simulationFixture) + const stake = await manager.getTotalStake() + const firstStake = await manager.getUserStake(firstUser.address) + const secondStake = await manager.getUserStake(secondUser.address) + const thirdStake = await manager.getUserStake(thirdUser.address) + const fourthStake = await manager.getUserStake(fourthUser.address) + + const line = "----------------------------------------" + console.log(`${line}\n💿 Simulation results\n${line}`) + console.log("🏦 Manager stake", ethers.utils.formatEther(stake)) + console.log("👤 First user stake", ethers.utils.formatEther(firstStake)) + console.log("👤 Second user stake", ethers.utils.formatEther(secondStake)) + console.log("👤 Third user stake", ethers.utils.formatEther(thirdStake)) + console.log("👤 Fourth user stake", ethers.utils.formatEther(fourthStake)) + const withdrawableBalance = await manager.getWithdrawableBalance() + console.log("📦 Withdrawable balance", ethers.utils.formatEther(withdrawableBalance)) + const dust = stake.sub(firstStake.add(secondStake).add(thirdStake).add(fourthStake)) + if (dust !== ethers.utils.parseEther("0.0")) { + console.log("🧹 Dust", ethers.utils.formatEther(dust)) + } + console.log(line) + }) }) \ No newline at end of file diff --git a/contracts/ethereum/test/operators.ts b/contracts/ethereum/test/operators.ts index 408165c98..58aad6716 100644 --- a/contracts/ethereum/test/operators.ts +++ b/contracts/ethereum/test/operators.ts @@ -7,145 +7,149 @@ import { initiatePoolHandler, reportCompletedExitsHandler } from "../helpers/ora import { fulfillReport, runUpkeep } from "../helpers/upkeep" describe("Operators", async function () { - it("Preregistration of operators 1 through 4 creates 4 eligible operators", async function () { - const { registry, views } = await loadFixture(preregistrationFixture) - const operatorIds = await registry.getOperatorIds() - const startIndex = 0 - const endIndex = operatorIds.length - const operators = await views.getOperators(startIndex, endIndex) - expect(operators.length).equal(4) - }) - - it("First initiated deposit uses 4 eligible operators", async function () { - const { manager, registry, views, daoOracle } = await loadFixture(preregistrationFixture) - const [firstUser] = await ethers.getSigners() - - const depositAmount = round(32 * ((100 + await manager.userFee()) / 100), 10) - const deposit = await manager.connect(firstUser).depositStake({ value: ethers.utils.parseEther(depositAmount.toString()) }) - await deposit.wait() - - await initiatePoolHandler({ manager, signer: daoOracle }) - - const operatorIds = await registry.getOperatorIds() - const startIndex = 0 - const endIndex = operatorIds.length - const operators = await views.getOperators(startIndex, endIndex) - - const operatorsWithPools = operators.filter(operator => Number(operator.poolCount.toString()) === 1) - expect(operatorsWithPools.length).equal(4) - }) - - it("Operator deregistration with 1 pool emits 1 reshare request", async function () { - const { manager, registry, ssvViews, daoOracle } = await loadFixture(preregistrationFixture) - const [firstUser] = await ethers.getSigners() - - const depositAmount = round(32 * ((100 + await manager.userFee()) / 100), 10) - const deposit = await manager.connect(firstUser).depositStake({ value: ethers.utils.parseEther(depositAmount.toString()) }) - await deposit.wait() - - await initiatePoolHandler({ manager, signer: daoOracle }) - - const operatorIds = await registry.getOperatorIds() - const deregisteringOperatorId = operatorIds[0] - const operatorOwnerAddress = (await ssvViews.getOperatorById(deregisteringOperatorId)).owner - const operatorOwnerSigner = ethers.provider.getSigner(operatorOwnerAddress) - await network.provider.request({ - method: "hardhat_impersonateAccount", - params: [operatorOwnerAddress] + it("Preregistration of operators 1 through 4 creates 4 eligible operators", async function () { + const { registry, views } = await loadFixture(preregistrationFixture) + const operatorIds = await registry.getOperatorIds() + const startIndex = 0 + const endIndex = operatorIds.length + const operators = await views.getOperators(startIndex, endIndex) + expect(operators.length).equal(4) }) - const requestDeactivation = await registry.connect(operatorOwnerSigner).requestDeactivation(deregisteringOperatorId) - await requestDeactivation.wait() - const deregisteringOperator = await registry.getOperator(deregisteringOperatorId) - - expect(deregisteringOperator.resharing).equal(true) - }) - - it("Operator deregistration with 0 pools allows immediate collateral withdrawal", async function () { - const { registry, ssvViews } = await loadFixture(preregistrationFixture) - - const operatorIds = await registry.getOperatorIds() - const deregisteringOperatorId = operatorIds[0] - const [operatorOwnerAddress] = await ssvViews.getOperatorById(deregisteringOperatorId) - const operatorOwnerSigner = ethers.provider.getSigner(operatorOwnerAddress) - await network.provider.request({ - method: "hardhat_impersonateAccount", - params: [operatorOwnerAddress] - }) - const requestDeactivation = await registry.connect(operatorOwnerSigner).requestDeactivation(deregisteringOperatorId) - await requestDeactivation.wait() - const deregisteringOperator = await registry.getOperator(deregisteringOperatorId) - const deactivationRequestedEvents = await registry.queryFilter(registry.filters.DeactivationRequested(), -1) - - expect(deregisteringOperator.active).equal(false) - expect(deregisteringOperator.resharing).equal(false) - expect(deactivationRequestedEvents.length).equal(0) - - const operatorOwnerBalanceBefore = await ethers.provider.getBalance(operatorOwnerAddress) - const requestWithdrawal = await registry.connect(operatorOwnerSigner).requestWithdrawal(deregisteringOperatorId, ethers.utils.parseEther("10")) - await requestWithdrawal.wait() - const operatorOwnerBalanceAfter = await ethers.provider.getBalance(operatorOwnerAddress) - const deregisteredOperator = await registry.getOperator(deregisteringOperatorId) - - expect(deregisteredOperator.collateral.toString()).equal("0") - expect(ethers.utils.formatEther(operatorOwnerBalanceAfter.sub(operatorOwnerBalanceBefore).toString())).contains("9.9") - }) - - it("Pool exits with 31.0 and recovers from the blamed operator", async function () { - const { - manager, - registry, - upkeep, - views, - secondUser, - donTransmitter, - daoOracle, - functionsBillingRegistry - } = await loadFixture(secondUserDepositFixture) - - const secondStake = await manager.getUserStake(secondUser.address) - const withdraw = await manager.connect(secondUser).requestWithdrawal(secondStake) - await withdraw.wait() - - const sweptExitedBalance = 31 - const withdrawnPoolId = (await manager.getStakedPoolIds())[0] - const withdrawnPoolAddress = await manager.getPoolAddress(withdrawnPoolId) - const currentBalance = await ethers.provider.getBalance(withdrawnPoolAddress) - const nextBalance = currentBalance.add(ethers.utils.parseEther(sweptExitedBalance.toString())) - await setBalance(withdrawnPoolAddress, nextBalance) - - await time.increase(time.duration.days(1)) - await runUpkeep({ donTransmitter, upkeep }) - - const reportValues = { - beaconBalance: 0, - sweptBalance: sweptExitedBalance, - activatedDeposits: 0, - forcedExits: 0, - completedExits: 1, - compoundablePoolIds: [0, - 0, - 0, - 0, - 0] - } - - await fulfillReport({ - donTransmitter, - upkeep, - functionsBillingRegistry, - values: reportValues + + it("First initiated deposit uses 4 eligible operators", async function () { + const { manager, registry, views, daoOracle } = await loadFixture(preregistrationFixture) + const [firstUser] = await ethers.getSigners() + + const depositAmount = round(32 * ((100 + await manager.userFee()) / 100), 10) + const deposit = + await manager.connect(firstUser).depositStake({ value: ethers.utils.parseEther(depositAmount.toString()) }) + await deposit.wait() + + await initiatePoolHandler({ manager, signer: daoOracle }) + + const operatorIds = await registry.getOperatorIds() + const startIndex = 0 + const endIndex = operatorIds.length + const operators = await views.getOperators(startIndex, endIndex) + + const operatorsWithPools = operators.filter(operator => Number(operator.poolCount.toString()) === 1) + expect(operatorsWithPools.length).equal(4) }) - await reportCompletedExitsHandler({ manager, views, signer: daoOracle, args: { count: 1 } }) - await runUpkeep({ donTransmitter, upkeep }) + it("Operator deregistration with 1 pool emits 1 reshare request", async function () { + const { manager, registry, ssvViews, daoOracle } = await loadFixture(preregistrationFixture) + const [firstUser] = await ethers.getSigners() + + const depositAmount = round(32 * ((100 + await manager.userFee()) / 100), 10) + const deposit = + await manager.connect(firstUser).depositStake({ value: ethers.utils.parseEther(depositAmount.toString()) }) + await deposit.wait() + + await initiatePoolHandler({ manager, signer: daoOracle }) + + const operatorIds = await registry.getOperatorIds() + const deregisteringOperatorId = operatorIds[0] + const operatorOwnerAddress = (await ssvViews.getOperatorById(deregisteringOperatorId)).owner + const operatorOwnerSigner = ethers.provider.getSigner(operatorOwnerAddress) + await network.provider.request({ + method: "hardhat_impersonateAccount", + params: [operatorOwnerAddress] + }) + const requestDeactivation = + await registry.connect(operatorOwnerSigner).requestDeactivation(deregisteringOperatorId) + await requestDeactivation.wait() + const deregisteringOperator = await registry.getOperator(deregisteringOperatorId) + + expect(deregisteringOperator.resharing).equal(true) + }) - const stake = await manager.getTotalStake() - const userStake = await manager.getUserStake(secondUser.address) - const blamedOperatorId = 208 // Hardcoded the first operator - const blamedOperator = await registry.getOperator(blamedOperatorId) + it("Operator deregistration with 0 pools allows immediate collateral withdrawal", async function () { + const { registry, ssvViews } = await loadFixture(preregistrationFixture) + + const operatorIds = await registry.getOperatorIds() + const deregisteringOperatorId = operatorIds[0] + const [operatorOwnerAddress] = await ssvViews.getOperatorById(deregisteringOperatorId) + const operatorOwnerSigner = ethers.provider.getSigner(operatorOwnerAddress) + await network.provider.request({ + method: "hardhat_impersonateAccount", + params: [operatorOwnerAddress] + }) + const requestDeactivation = + await registry.connect(operatorOwnerSigner).requestDeactivation(deregisteringOperatorId) + await requestDeactivation.wait() + const deregisteringOperator = await registry.getOperator(deregisteringOperatorId) + const deactivationRequestedEvents = await registry.queryFilter(registry.filters.DeactivationRequested(), -1) + + expect(deregisteringOperator.active).equal(false) + expect(deregisteringOperator.resharing).equal(false) + expect(deactivationRequestedEvents.length).equal(0) + + const operatorOwnerBalanceBefore = await ethers.provider.getBalance(operatorOwnerAddress) + const requestWithdrawal = await registry.connect(operatorOwnerSigner).requestWithdrawal(deregisteringOperatorId, ethers.utils.parseEther("10")) + await requestWithdrawal.wait() + const operatorOwnerBalanceAfter = await ethers.provider.getBalance(operatorOwnerAddress) + const deregisteredOperator = await registry.getOperator(deregisteringOperatorId) + + expect(deregisteredOperator.collateral.toString()).equal("0") + expect(ethers.utils.formatEther(operatorOwnerBalanceAfter.sub(operatorOwnerBalanceBefore).toString())).contains("9.9") + }) - expect(ethers.utils.formatEther(stake)).equal("16.0") - expect(ethers.utils.formatEther(userStake)).equal("0.0") - expect(blamedOperator.collateral.toString()).equal(ethers.utils.parseEther("9.0").toString()) - }) + it("Pool exits with 31.0 and recovers from the blamed operator", async function () { + const { + manager, + registry, + upkeep, + views, + secondUser, + donTransmitter, + daoOracle, + functionsBillingRegistry + } = await loadFixture(secondUserDepositFixture) + + const secondStake = await manager.getUserStake(secondUser.address) + const withdraw = await manager.connect(secondUser).requestWithdrawal(secondStake) + await withdraw.wait() + + const sweptExitedBalance = 31 + const withdrawnPoolId = (await manager.getStakedPoolIds())[0] + const withdrawnPoolAddress = await manager.getPoolAddress(withdrawnPoolId) + const currentBalance = await ethers.provider.getBalance(withdrawnPoolAddress) + const nextBalance = currentBalance.add(ethers.utils.parseEther(sweptExitedBalance.toString())) + await setBalance(withdrawnPoolAddress, nextBalance) + + await time.increase(time.duration.days(1)) + await runUpkeep({ donTransmitter, upkeep }) + + const reportValues = { + beaconBalance: 0, + sweptBalance: sweptExitedBalance, + activatedDeposits: 0, + forcedExits: 0, + completedExits: 1, + compoundablePoolIds: [0, + 0, + 0, + 0, + 0] + } + + await fulfillReport({ + donTransmitter, + upkeep, + functionsBillingRegistry, + values: reportValues + }) + + await reportCompletedExitsHandler({ manager, views, signer: daoOracle, args: { count: 1 } }) + await runUpkeep({ donTransmitter, upkeep }) + + const stake = await manager.getTotalStake() + const userStake = await manager.getUserStake(secondUser.address) + const blamedOperatorId = 208 // Hardcoded the first operator + const blamedOperator = await registry.getOperator(blamedOperatorId) + + expect(ethers.utils.formatEther(stake)).equal("16.0") + expect(ethers.utils.formatEther(userStake)).equal("0.0") + expect(blamedOperator.collateral.toString()).equal(ethers.utils.parseEther("9.0").toString()) + }) }) \ No newline at end of file diff --git a/contracts/ethereum/test/users.ts b/contracts/ethereum/test/users.ts index 770913072..12ee0ec9e 100644 --- a/contracts/ethereum/test/users.ts +++ b/contracts/ethereum/test/users.ts @@ -7,139 +7,142 @@ import { activatePoolsHandler, depositFunctionsBalanceHandler, depositUpkeepBala import { fulfillReport, runUpkeep } from "../helpers/upkeep" describe("Users", async function () { - it("User's 16.0 stake and half withdrawal updates total and user stake, and user balance", async function () { - const { manager } = await loadFixture(preregistrationFixture) - const [firstUser] = await ethers.getSigners() - - const depositAmount = round(16 * ((100 + await manager.userFee()) / 100), 10) - const deposit = await manager.connect(firstUser).depositStake({ value: ethers.utils.parseEther(depositAmount.toString()) }) - await deposit.wait() - - let stake = await manager.getTotalStake() - let userStake = await manager.getUserStake(firstUser.address) - - expect(ethers.utils.formatEther(stake)).equal("16.0") - expect(ethers.utils.formatEther(userStake)).equal("16.0") - - const userBalanceBefore = await ethers.provider.getBalance(firstUser.address) - const userWithdrawalRequest = await manager.connect(firstUser).requestWithdrawal(ethers.utils.parseEther("8.0")) - await userWithdrawalRequest.wait() - const userBalanceAfter = await ethers.provider.getBalance(firstUser.address) - - stake = await manager.getTotalStake() - userStake = await manager.getUserStake(firstUser.address) - - expect(ethers.utils.formatEther(stake)).equal("8.0") - expect(ethers.utils.formatEther(userStake)).equal("8.0") - expect(ethers.utils.formatEther(userBalanceAfter.sub(userBalanceBefore))).contains("7.9") - }) - - it("User's 64.0 stake and half withdrawal updates total and user stake, and user balance", async function () { - const { manager, upkeep, views, functionsBillingRegistry, daoOracle, donTransmitter } = await loadFixture(preregistrationFixture) - const [firstUser] = await ethers.getSigners() - - const depositAmount = round(64 * ((100 + await manager.userFee()) / 100), 10) - const deposit = await manager.connect(firstUser).depositStake({ value: ethers.utils.parseEther(depositAmount.toString()) }) - await deposit.wait() - - await depositFunctionsBalanceHandler({ manager, signer: daoOracle }) - await depositUpkeepBalanceHandler({ manager, signer: daoOracle }) - - await initiatePoolHandler({ manager, signer: daoOracle }) - await initiatePoolHandler({ manager, signer: daoOracle }) - - const pendingPoolIds = await manager.getPendingPoolIds() - - expect(pendingPoolIds.length).equal(2) - - await time.increase(time.duration.days(1)) - await runUpkeep({ donTransmitter, upkeep }) - - const firstReportValues = { - beaconBalance: 64, - sweptBalance: 0, - activatedDeposits: 2, - forcedExits: 0, - completedExits: 0, - compoundablePoolIds: [0, - 0, - 0, - 0, - 0] - } - - await fulfillReport({ - donTransmitter, - upkeep, - functionsBillingRegistry, - values: firstReportValues - }) - - await activatePoolsHandler({ manager, views, signer: daoOracle, args: { count: 2 } }) - - await runUpkeep({ donTransmitter, upkeep }) - - const stakedPoolIds = await manager.getStakedPoolIds() + it("User's 16.0 stake and half withdrawal updates total and user stake, and user balance", async function () { + const { manager } = await loadFixture(preregistrationFixture) + const [firstUser] = await ethers.getSigners() - expect(stakedPoolIds.length).equal(2) + const depositAmount = round(16 * ((100 + await manager.userFee()) / 100), 10) + const value = ethers.utils.parseEther(depositAmount.toString()) + const deposit = await manager.connect(firstUser).depositStake({ value }) + await deposit.wait() - let stake = await manager.getTotalStake() - let userStake = await manager.getUserStake(firstUser.address) + let stake = await manager.getTotalStake() + let userStake = await manager.getUserStake(firstUser.address) - expect(ethers.utils.formatEther(stake)).equal("64.0") - expect(ethers.utils.formatEther(userStake)).equal("64.0") + expect(ethers.utils.formatEther(stake)).equal("16.0") + expect(ethers.utils.formatEther(userStake)).equal("16.0") - const userBalanceBefore = await ethers.provider.getBalance(firstUser.address) - const userWithdrawalRequest = await manager.connect(firstUser).requestWithdrawal(ethers.utils.parseEther("32.0")) - await userWithdrawalRequest.wait() + const userBalanceBefore = await ethers.provider.getBalance(firstUser.address) + const userWithdrawalRequest = await manager.connect(firstUser).requestWithdrawal(ethers.utils.parseEther("8.0")) + await userWithdrawalRequest.wait() + const userBalanceAfter = await ethers.provider.getBalance(firstUser.address) - stake = await manager.getTotalStake() - userStake = await manager.getUserStake(firstUser.address) + stake = await manager.getTotalStake() + userStake = await manager.getUserStake(firstUser.address) - expect(ethers.utils.formatEther(stake)).equal("32.0") - expect(ethers.utils.formatEther(userStake)).equal("32.0") - - await time.increase(time.duration.days(1)) - await runUpkeep({ donTransmitter, upkeep }) - - const sweptExitedBalance = 32 - const secondReportValues = { - beaconBalance: 32, - sweptBalance: sweptExitedBalance, - activatedDeposits: 0, - forcedExits: 0, - completedExits: 1, - compoundablePoolIds: [0, - 0, - 0, - 0, - 0] - } - - await fulfillReport({ - donTransmitter, - upkeep, - functionsBillingRegistry, - values: secondReportValues + expect(ethers.utils.formatEther(stake)).equal("8.0") + expect(ethers.utils.formatEther(userStake)).equal("8.0") + expect(ethers.utils.formatEther(userBalanceAfter.sub(userBalanceBefore))).contains("7.9") }) - const exitedPoolId = (await manager.getStakedPoolIds())[0] - const exitedPoolAddress = await manager.getPoolAddress(exitedPoolId) - const currentBalance = await ethers.provider.getBalance(exitedPoolAddress) - const nextBalance = currentBalance.add(ethers.utils.parseEther(sweptExitedBalance.toString())) - await setBalance(exitedPoolAddress, nextBalance) - await reportCompletedExitsHandler({ manager, views, signer: daoOracle, args: { count: 1 } }) - const finalizableCompletedExits = await manager.finalizableCompletedExits() - expect(finalizableCompletedExits.toNumber()).equal(1) - await runUpkeep({ donTransmitter, upkeep }) - - stake = await manager.getTotalStake() - userStake = await manager.getUserStake(firstUser.address) - - const userBalanceAfter = await ethers.provider.getBalance(firstUser.address) - - expect(ethers.utils.formatEther(stake)).equal("32.0") - expect(ethers.utils.formatEther(userStake)).equal("32.0") - expect(ethers.utils.formatEther(userBalanceAfter.sub(userBalanceBefore))).contains("31.9") - }) + it("User's 64.0 stake and half withdrawal updates total and user stake, and user balance", async function () { + const { manager, upkeep, views, functionsBillingRegistry, daoOracle, donTransmitter } = + await loadFixture(preregistrationFixture) + const [firstUser] = await ethers.getSigners() + + const depositAmount = round(64 * ((100 + await manager.userFee()) / 100), 10) + const value = ethers.utils.parseEther(depositAmount.toString()) + const deposit = await manager.connect(firstUser).depositStake({ value }) + await deposit.wait() + + await depositFunctionsBalanceHandler({ manager, signer: daoOracle }) + await depositUpkeepBalanceHandler({ manager, signer: daoOracle }) + + await initiatePoolHandler({ manager, signer: daoOracle }) + await initiatePoolHandler({ manager, signer: daoOracle }) + + const pendingPoolIds = await manager.getPendingPoolIds() + + expect(pendingPoolIds.length).equal(2) + + await time.increase(time.duration.days(1)) + await runUpkeep({ donTransmitter, upkeep }) + + const firstReportValues = { + beaconBalance: 64, + sweptBalance: 0, + activatedDeposits: 2, + forcedExits: 0, + completedExits: 0, + compoundablePoolIds: [0, + 0, + 0, + 0, + 0] + } + + await fulfillReport({ + donTransmitter, + upkeep, + functionsBillingRegistry, + values: firstReportValues + }) + + await activatePoolsHandler({ manager, views, signer: daoOracle, args: { count: 2 } }) + + await runUpkeep({ donTransmitter, upkeep }) + + const stakedPoolIds = await manager.getStakedPoolIds() + + expect(stakedPoolIds.length).equal(2) + + let stake = await manager.getTotalStake() + let userStake = await manager.getUserStake(firstUser.address) + + expect(ethers.utils.formatEther(stake)).equal("64.0") + expect(ethers.utils.formatEther(userStake)).equal("64.0") + + const userBalanceBefore = await ethers.provider.getBalance(firstUser.address) + const userWithdrawalRequest = await manager.connect(firstUser).requestWithdrawal(ethers.utils.parseEther("32.0")) + await userWithdrawalRequest.wait() + + stake = await manager.getTotalStake() + userStake = await manager.getUserStake(firstUser.address) + + expect(ethers.utils.formatEther(stake)).equal("32.0") + expect(ethers.utils.formatEther(userStake)).equal("32.0") + + await time.increase(time.duration.days(1)) + await runUpkeep({ donTransmitter, upkeep }) + + const sweptExitedBalance = 32 + const secondReportValues = { + beaconBalance: 32, + sweptBalance: sweptExitedBalance, + activatedDeposits: 0, + forcedExits: 0, + completedExits: 1, + compoundablePoolIds: [0, + 0, + 0, + 0, + 0] + } + + await fulfillReport({ + donTransmitter, + upkeep, + functionsBillingRegistry, + values: secondReportValues + }) + + const exitedPoolId = (await manager.getStakedPoolIds())[0] + const exitedPoolAddress = await manager.getPoolAddress(exitedPoolId) + const currentBalance = await ethers.provider.getBalance(exitedPoolAddress) + const nextBalance = currentBalance.add(ethers.utils.parseEther(sweptExitedBalance.toString())) + await setBalance(exitedPoolAddress, nextBalance) + await reportCompletedExitsHandler({ manager, views, signer: daoOracle, args: { count: 1 } }) + const finalizableCompletedExits = await manager.finalizableCompletedExits() + expect(finalizableCompletedExits.toNumber()).equal(1) + await runUpkeep({ donTransmitter, upkeep }) + + stake = await manager.getTotalStake() + userStake = await manager.getUserStake(firstUser.address) + + const userBalanceAfter = await ethers.provider.getBalance(firstUser.address) + + expect(ethers.utils.formatEther(stake)).equal("32.0") + expect(ethers.utils.formatEther(userStake)).equal("32.0") + expect(ethers.utils.formatEther(userBalanceAfter.sub(userBalanceBefore))).contains("31.9") + }) }) \ No newline at end of file diff --git a/infrastructure/cdk/src/index.ts b/infrastructure/cdk/src/index.ts index b28f2b0ce..92f9777b1 100755 --- a/infrastructure/cdk/src/index.ts +++ b/infrastructure/cdk/src/index.ts @@ -18,15 +18,15 @@ const { hostedZone, certificate } = new DnsStack(app, config.getFullStackName("d const { vpc } = new NetworkStack(app, config.getFullStackName("network"), { env }) if (stage !== "prod") { - new AnalyticsStack(app, config.getFullStackName("analytics"), { env }) - new BlogStack(app, config.getFullStackName("blog"), { env, certificate, hostedZone, vpc }) - new DocsStack(app, config.getFullStackName("docs"), { env, certificate, hostedZone }) - new LandingStack(app, config.getFullStackName("landing"), { env, certificate, hostedZone }) - new UsersStack(app, config.getFullStackName("users"), { env, certificate, hostedZone, vpc }) - new WebStack(app, config.getFullStackName("web"), { env, certificate, hostedZone }) + new AnalyticsStack(app, config.getFullStackName("analytics"), { env }) + new BlogStack(app, config.getFullStackName("blog"), { env, certificate, hostedZone, vpc }) + new DocsStack(app, config.getFullStackName("docs"), { env, certificate, hostedZone }) + new LandingStack(app, config.getFullStackName("landing"), { env, certificate, hostedZone }) + new UsersStack(app, config.getFullStackName("users"), { env, certificate, hostedZone, vpc }) + new WebStack(app, config.getFullStackName("web"), { env, certificate, hostedZone }) } else { - new BlogStack(app, config.getFullStackName("blog"), { env, certificate, hostedZone, vpc }) - new DocsStack(app, config.getFullStackName("docs"), { env, certificate, hostedZone }) - new LandingStack(app, config.getFullStackName("landing"), { env, certificate, hostedZone }) - new NodesStack(app, config.getFullStackName("nodes"), { env, hostedZone }) + new BlogStack(app, config.getFullStackName("blog"), { env, certificate, hostedZone, vpc }) + new DocsStack(app, config.getFullStackName("docs"), { env, certificate, hostedZone }) + new LandingStack(app, config.getFullStackName("landing"), { env, certificate, hostedZone }) + new NodesStack(app, config.getFullStackName("nodes"), { env, hostedZone }) } diff --git a/infrastructure/cdk/src/providers/analytics.ts b/infrastructure/cdk/src/providers/analytics.ts index 1908f74e5..26e5c0e77 100644 --- a/infrastructure/cdk/src/providers/analytics.ts +++ b/infrastructure/cdk/src/providers/analytics.ts @@ -11,46 +11,46 @@ import { AnalyticsStackProps } from "../interfaces/StackProps" * Data analytics stack */ export class AnalyticsStack extends cdk.Stack { - public readonly name = pascalCase("analytics") + public readonly name = pascalCase("analytics") - constructor(scope: Construct, id: string, props: AnalyticsStackProps) { - super(scope, id, props) + constructor(scope: Construct, id: string, props: AnalyticsStackProps) { + super(scope, id, props) - const config = new Config() + const config = new Config() - const eventColumns = new Schema(eventSchema).getGlueColumns() - const actionColumns = new Schema(actionSchema).getGlueColumns() + const eventColumns = new Schema(eventSchema).getGlueColumns() + const actionColumns = new Schema(actionSchema).getGlueColumns() - const database = new glue.Database(this, config.getFullStackResourceName(this.name, "database"), { - databaseName: snakeCase(config.getFullStackResourceName(this.name, "database")) - }) + const database = new glue.Database(this, config.getFullStackResourceName(this.name, "database"), { + databaseName: snakeCase(config.getFullStackResourceName(this.name, "database")) + }) - const eventBucket = new s3.Bucket(this, config.getFullStackResourceName(this.name, "event-bucket", config.dataVersion), { - bucketName: kebabCase(config.getFullStackResourceName(this.name, "event-bucket", config.dataVersion)) - }) + const eventBucket = new s3.Bucket(this, config.getFullStackResourceName(this.name, "event-bucket", config.dataVersion), { + bucketName: kebabCase(config.getFullStackResourceName(this.name, "event-bucket", config.dataVersion)) + }) - const actionBucket = new s3.Bucket(this, config.getFullStackResourceName(this.name, "action-bucket", config.dataVersion), { - bucketName: kebabCase(config.getFullStackResourceName(this.name, "action-bucket", config.dataVersion)) - }) + const actionBucket = new s3.Bucket(this, config.getFullStackResourceName(this.name, "action-bucket", config.dataVersion), { + bucketName: kebabCase(config.getFullStackResourceName(this.name, "action-bucket", config.dataVersion)) + }) - new s3.Bucket(this, config.getFullStackResourceName(this.name, "output-bucket", config.dataVersion), { - bucketName: kebabCase(config.getFullStackResourceName(this.name, "output-bucket", config.dataVersion)) - }) - - new glue.Table(this, config.getFullStackResourceName(this.name, "event-table", config.dataVersion), { - database: database, - tableName: snakeCase(config.getFullStackResourceName(this.name, "event-table", config.dataVersion)), - bucket: eventBucket, - columns: eventColumns, - dataFormat: glue.DataFormat.JSON, - }) + new s3.Bucket(this, config.getFullStackResourceName(this.name, "output-bucket", config.dataVersion), { + bucketName: kebabCase(config.getFullStackResourceName(this.name, "output-bucket", config.dataVersion)) + }) + + new glue.Table(this, config.getFullStackResourceName(this.name, "event-table", config.dataVersion), { + database: database, + tableName: snakeCase(config.getFullStackResourceName(this.name, "event-table", config.dataVersion)), + bucket: eventBucket, + columns: eventColumns, + dataFormat: glue.DataFormat.JSON, + }) - new glue.Table(this, config.getFullStackResourceName(this.name, "action-table", config.dataVersion), { - database: database, - tableName: snakeCase(config.getFullStackResourceName(this.name, "action-table", config.dataVersion)), - bucket: actionBucket, - columns: actionColumns, - dataFormat: glue.DataFormat.JSON, - }) - } + new glue.Table(this, config.getFullStackResourceName(this.name, "action-table", config.dataVersion), { + database: database, + tableName: snakeCase(config.getFullStackResourceName(this.name, "action-table", config.dataVersion)), + bucket: actionBucket, + columns: actionColumns, + dataFormat: glue.DataFormat.JSON, + }) + } } \ No newline at end of file diff --git a/infrastructure/cdk/src/providers/blog.ts b/infrastructure/cdk/src/providers/blog.ts index 71e147abb..902e1aec7 100644 --- a/infrastructure/cdk/src/providers/blog.ts +++ b/infrastructure/cdk/src/providers/blog.ts @@ -12,48 +12,48 @@ import { kebabCase, pascalCase } from "@casimir/format" * Blog service stack */ export class BlogStack extends cdk.Stack { - public readonly name = "blog" + public readonly name = "blog" - constructor(scope: Construct, id: string, props: BlogStackProps) { - super(scope, id, props) + constructor(scope: Construct, id: string, props: BlogStackProps) { + super(scope, id, props) - const config = new Config() - const { project, stage, rootDomain, subdomains } = config - const { certificate, hostedZone, vpc } = props + const config = new Config() + const { project, stage, rootDomain, subdomains } = config + const { certificate, hostedZone, vpc } = props - const imageAsset = new ecrAssets.DockerImageAsset(this, config.getFullStackResourceName(this.name, "image"), { - directory: "../../", - file: "services/blog/Dockerfile", - platform: ecrAssets.Platform.LINUX_AMD64, - ignoreMode: cdk.IgnoreMode.GIT - }) + const imageAsset = new ecrAssets.DockerImageAsset(this, config.getFullStackResourceName(this.name, "image"), { + directory: "../../", + file: "services/blog/Dockerfile", + platform: ecrAssets.Platform.LINUX_AMD64, + ignoreMode: cdk.IgnoreMode.GIT + }) - const hackmdTokenKey = "casimir-blog-hackmd-token" - const hackmdToken = ecs.Secret.fromSecretsManager( - secretsmanager.Secret.fromSecretNameV2(this, pascalCase(hackmdTokenKey), kebabCase(hackmdTokenKey)) - ) + const hackmdTokenKey = "casimir-blog-hackmd-token" + const hackmdToken = ecs.Secret.fromSecretsManager( + secretsmanager.Secret.fromSecretNameV2(this, pascalCase(hackmdTokenKey), kebabCase(hackmdTokenKey)) + ) - const fargateService = new ecsPatterns.ApplicationLoadBalancedFargateService(this, config.getFullStackResourceName(this.name, "fargate"), { - assignPublicIp: true, - certificate, - domainName: `${subdomains.blog}.${rootDomain}`, // e.g. blog.casimir.co or blog.dev.casimir.co - domainZone: hostedZone, - taskImageOptions: { - containerPort: 4001, - image: ecs.ContainerImage.fromDockerImageAsset(imageAsset), - environment: { - PROJECT: project, - STAGE: stage - }, - secrets: { - HACKMD_TOKEN: hackmdToken - } - }, - vpc - }) + const fargateService = new ecsPatterns.ApplicationLoadBalancedFargateService(this, config.getFullStackResourceName(this.name, "fargate"), { + assignPublicIp: true, + certificate, + domainName: `${subdomains.blog}.${rootDomain}`, // e.g. blog.casimir.co or blog.dev.casimir.co + domainZone: hostedZone, + taskImageOptions: { + containerPort: 4001, + image: ecs.ContainerImage.fromDockerImageAsset(imageAsset), + environment: { + PROJECT: project, + STAGE: stage + }, + secrets: { + HACKMD_TOKEN: hackmdToken + } + }, + vpc + }) - fargateService.targetGroup.configureHealthCheck({ - path: "/health" - }) - } + fargateService.targetGroup.configureHealthCheck({ + path: "/health" + }) + } } \ No newline at end of file diff --git a/infrastructure/cdk/src/providers/config.ts b/infrastructure/cdk/src/providers/config.ts index c4dce91e3..e22c1668b 100644 --- a/infrastructure/cdk/src/providers/config.ts +++ b/infrastructure/cdk/src/providers/config.ts @@ -6,53 +6,53 @@ import dataPackage from "@casimir/data/package.json" * CDK app config */ export class Config implements ProjectConfig { - public readonly project - public readonly stage - public readonly env - public readonly rootDomain - public readonly subdomains - public readonly dataVersion + public readonly project + public readonly stage + public readonly env + public readonly rootDomain + public readonly subdomains + public readonly dataVersion - public readonly requiredEnvVars = ["PROJECT", - "STAGE", - "AWS_ACCOUNT", - "AWS_REGION"] + public readonly requiredEnvVars = ["PROJECT", + "STAGE", + "AWS_ACCOUNT", + "AWS_REGION"] - constructor() { - this.checkEnvVars() - this.project = process.env.PROJECT as string - this.stage = process.env.STAGE as string - this.env = { - account: process.env.AWS_ACCOUNT as string, - region: process.env.AWS_REGION as string + constructor() { + this.checkEnvVars() + this.project = process.env.PROJECT as string + this.stage = process.env.STAGE as string + this.env = { + account: process.env.AWS_ACCOUNT as string, + region: process.env.AWS_REGION as string + } + this.rootDomain = `${this.stage === "prod" ? "" : `${this.stage}.`}casimir.co` + this.subdomains = { + blog: "blog", + docs: "docs", + nodes: "nodes", + landing: "www", + users: "users", + web: "app", + wildcard: "*" + } + this.dataVersion = Number(dataPackage.version.split(".")[0]) } - this.rootDomain = `${this.stage === "prod" ? "" : `${this.stage}.`}casimir.co` - this.subdomains = { - blog: "blog", - docs: "docs", - nodes: "nodes", - landing: "www", - users: "users", - web: "app", - wildcard: "*" - } - this.dataVersion = Number(dataPackage.version.split(".")[0]) - } - /** + /** * Check for required environment variables and exit if any are missing * @returns void */ - checkEnvVars(): void { - this.requiredEnvVars.forEach(v => { - if (!process.env[v]) { - console.log("No value provided for", v) - process.exit(1) - } - }) - } + checkEnvVars(): void { + this.requiredEnvVars.forEach(v => { + if (!process.env[v]) { + console.log("No value provided for", v) + process.exit(1) + } + }) + } - /** + /** * Get stack name with project prefix and stage suffix * @param stackName Stack name * @returns Full stack name @@ -62,11 +62,11 @@ export class Config implements ProjectConfig { * console.log(stackName) // EtlDev * ``` */ - getFullStackName(stackName: string): string { - return pascalCase(this.project) + pascalCase(stackName) + pascalCase(this.stage) - } + getFullStackName(stackName: string): string { + return pascalCase(this.project) + pascalCase(stackName) + pascalCase(this.stage) + } - /** + /** * Get stack resource name with project prefix and stage suffix * @param stackName Stack name * @param resourceName Resource name @@ -78,11 +78,12 @@ export class Config implements ProjectConfig { * console.log(resourceName) // CasimirEtlEventBucketDev * ``` */ - getFullStackResourceName(stackName: string, resourceName: string, version?: number): string { - const name = pascalCase(this.project) + pascalCase(stackName) + pascalCase(resourceName) + pascalCase(this.stage) - if (version) { - return name + version + getFullStackResourceName(stackName: string, resourceName: string, version?: number): string { + const name = + pascalCase(this.project) + pascalCase(stackName) + pascalCase(resourceName) + pascalCase(this.stage) + if (version) { + return name + version + } + return name } - return name - } } \ No newline at end of file diff --git a/infrastructure/cdk/src/providers/dns.ts b/infrastructure/cdk/src/providers/dns.ts index a429f8494..8f55d28e5 100644 --- a/infrastructure/cdk/src/providers/dns.ts +++ b/infrastructure/cdk/src/providers/dns.ts @@ -10,31 +10,31 @@ import { Config } from "./config" * Route53 dns stack */ export class DnsStack extends cdk.Stack { - public readonly name = pascalCase("dns") - public readonly hostedZone: route53.HostedZone - public readonly certificate: certmgr.Certificate + public readonly name = pascalCase("dns") + public readonly hostedZone: route53.HostedZone + public readonly certificate: certmgr.Certificate - constructor(scope: Construct, id: string, props: DnsStackProps) { - super(scope, id, props) + constructor(scope: Construct, id: string, props: DnsStackProps) { + super(scope, id, props) - const config = new Config() - const { rootDomain, subdomains } = config + const config = new Config() + const { rootDomain, subdomains } = config - const absoluteRootDomain = (() => { - if (rootDomain.split(".").length > 2) { - return rootDomain.split(".").slice(1).join(".") - } - return rootDomain - })() + const absoluteRootDomain = (() => { + if (rootDomain.split(".").length > 2) { + return rootDomain.split(".").slice(1).join(".") + } + return rootDomain + })() - this.hostedZone = route53.HostedZone.fromLookup(this, config.getFullStackResourceName(this.name, "hosted-zone"), { - domainName: absoluteRootDomain - }) as route53.HostedZone + this.hostedZone = route53.HostedZone.fromLookup(this, config.getFullStackResourceName(this.name, "hosted-zone"), { + domainName: absoluteRootDomain + }) as route53.HostedZone - this.certificate = new certmgr.Certificate(this, config.getFullStackResourceName(this.name, "cert"), { - domainName: rootDomain, - subjectAlternativeNames: [`${subdomains.wildcard}.${rootDomain}`], - validation: certmgr.CertificateValidation.fromDns(this.hostedZone) - }) - } + this.certificate = new certmgr.Certificate(this, config.getFullStackResourceName(this.name, "cert"), { + domainName: rootDomain, + subjectAlternativeNames: [`${subdomains.wildcard}.${rootDomain}`], + validation: certmgr.CertificateValidation.fromDns(this.hostedZone) + }) + } } \ No newline at end of file diff --git a/infrastructure/cdk/src/providers/docs.ts b/infrastructure/cdk/src/providers/docs.ts index 8094e5e8e..297258f50 100644 --- a/infrastructure/cdk/src/providers/docs.ts +++ b/infrastructure/cdk/src/providers/docs.ts @@ -15,76 +15,76 @@ import { Config } from "./config" * Docs app stack */ export class DocsStack extends cdk.Stack { - public readonly name = pascalCase("docs") + public readonly name = pascalCase("docs") - constructor(scope: Construct, id: string, props: DocsStackProps) { - super(scope, id, props) + constructor(scope: Construct, id: string, props: DocsStackProps) { + super(scope, id, props) - const config = new Config() - const { rootDomain, subdomains } = config - const { hostedZone, certificate } = props + const config = new Config() + const { rootDomain, subdomains } = config + const { hostedZone, certificate } = props - const bucket = new s3.Bucket(this, config.getFullStackResourceName(this.name, "bucket"), { - accessControl: s3.BucketAccessControl.PRIVATE - }) + const bucket = new s3.Bucket(this, config.getFullStackResourceName(this.name, "bucket"), { + accessControl: s3.BucketAccessControl.PRIVATE + }) - const originAccessIdentity = new cloudfront.OriginAccessIdentity(this, config.getFullStackResourceName(this.name, "origin-access-identity")) - bucket.grantRead(originAccessIdentity) + const originAccessIdentity = new cloudfront.OriginAccessIdentity(this, config.getFullStackResourceName(this.name, "origin-access-identity")) + bucket.grantRead(originAccessIdentity) - const distributionCertificate = (() => { - if (certificate?.env.region === "us-east-1") return certificate - /** Replace deprecated method when cross-region support is out of beta */ - return new certmgr.DnsValidatedCertificate(this, config.getFullStackResourceName(this.name, "cert"), { - domainName: rootDomain, - subjectAlternativeNames: [`${subdomains.docs}.${rootDomain}`], - hostedZone, - region: "us-east-1" - }) - })() + const distributionCertificate = (() => { + if (certificate?.env.region === "us-east-1") return certificate + /** Replace deprecated method when cross-region support is out of beta */ + return new certmgr.DnsValidatedCertificate(this, config.getFullStackResourceName(this.name, "cert"), { + domainName: rootDomain, + subjectAlternativeNames: [`${subdomains.docs}.${rootDomain}`], + hostedZone, + region: "us-east-1" + }) + })() - const redirectFunction = new cloudfront.Function(this, config.getFullStackResourceName(this.name, "redirect"), { - code: cloudfront.FunctionCode.fromFile({ filePath: "../../services/redirect/dist/index.js" }) - }) + const redirectFunction = new cloudfront.Function(this, config.getFullStackResourceName(this.name, "redirect"), { + code: cloudfront.FunctionCode.fromFile({ filePath: "../../services/redirect/dist/index.js" }) + }) - const distribution = new cloudfront.Distribution(this, config.getFullStackResourceName(this.name, "distribution"), { - certificate: distributionCertificate, - defaultRootObject: "index.html", - defaultBehavior: { - functionAssociations: [{ - function: redirectFunction, - eventType: cloudfront.FunctionEventType.VIEWER_REQUEST - }], - viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS, - origin: new cloudfrontOrigins.S3Origin(bucket, { originAccessIdentity }) - }, - errorResponses: [ - { - httpStatus: 403, - responseHttpStatus: 200, - responsePagePath: "/index.html", - ttl: cdk.Duration.minutes(30) - }, { - httpStatus: 404, - responseHttpStatus: 200, - responsePagePath: "/index.html", - ttl: cdk.Duration.minutes(30) - } - ], - domainNames: [`${subdomains.docs}.${rootDomain}`] - }) + const distribution = new cloudfront.Distribution(this, config.getFullStackResourceName(this.name, "distribution"), { + certificate: distributionCertificate, + defaultRootObject: "index.html", + defaultBehavior: { + functionAssociations: [{ + function: redirectFunction, + eventType: cloudfront.FunctionEventType.VIEWER_REQUEST + }], + viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS, + origin: new cloudfrontOrigins.S3Origin(bucket, { originAccessIdentity }) + }, + errorResponses: [ + { + httpStatus: 403, + responseHttpStatus: 200, + responsePagePath: "/index.html", + ttl: cdk.Duration.minutes(30) + }, { + httpStatus: 404, + responseHttpStatus: 200, + responsePagePath: "/index.html", + ttl: cdk.Duration.minutes(30) + } + ], + domainNames: [`${subdomains.docs}.${rootDomain}`] + }) - new s3Deployment.BucketDeployment(this, config.getFullStackResourceName(this.name, "bucket-deployment"), { - destinationBucket: bucket, - sources: [s3Deployment.Source.asset("../../apps/docs/dist")], - distribution, - distributionPaths: ["/*"], - }) + new s3Deployment.BucketDeployment(this, config.getFullStackResourceName(this.name, "bucket-deployment"), { + destinationBucket: bucket, + sources: [s3Deployment.Source.asset("../../apps/docs/dist")], + distribution, + distributionPaths: ["/*"], + }) - new route53.ARecord(this, config.getFullStackResourceName(this.name, "a-record-docs"), { - recordName: `${subdomains.docs}.${rootDomain}`, - zone: hostedZone as route53.IHostedZone, - target: route53.RecordTarget.fromAlias(new route53targets.CloudFrontTarget(distribution)), - ttl: cdk.Duration.minutes(1), - }) - } + new route53.ARecord(this, config.getFullStackResourceName(this.name, "a-record-docs"), { + recordName: `${subdomains.docs}.${rootDomain}`, + zone: hostedZone as route53.IHostedZone, + target: route53.RecordTarget.fromAlias(new route53targets.CloudFrontTarget(distribution)), + ttl: cdk.Duration.minutes(1), + }) + } } \ No newline at end of file diff --git a/infrastructure/cdk/src/providers/landing.ts b/infrastructure/cdk/src/providers/landing.ts index 38bf41b32..f8c98958a 100644 --- a/infrastructure/cdk/src/providers/landing.ts +++ b/infrastructure/cdk/src/providers/landing.ts @@ -15,75 +15,75 @@ import { Config } from "./config" * Landing page stack */ export class LandingStack extends cdk.Stack { - public readonly name = pascalCase("landing") + public readonly name = pascalCase("landing") - constructor(scope: Construct, id: string, props: LandingStackProps) { - super(scope, id, props) + constructor(scope: Construct, id: string, props: LandingStackProps) { + super(scope, id, props) - const config = new Config() - const { rootDomain, subdomains } = config - const { hostedZone, certificate } = props + const config = new Config() + const { rootDomain, subdomains } = config + const { hostedZone, certificate } = props - const bucket = new s3.Bucket(this, config.getFullStackResourceName(this.name, "bucket"), { - accessControl: s3.BucketAccessControl.PRIVATE - }) + const bucket = new s3.Bucket(this, config.getFullStackResourceName(this.name, "bucket"), { + accessControl: s3.BucketAccessControl.PRIVATE + }) - const originAccessIdentity = new cloudfront.OriginAccessIdentity(this, config.getFullStackResourceName(this.name, "origin-access-identity")) - bucket.grantRead(originAccessIdentity) + const originAccessIdentity = new cloudfront.OriginAccessIdentity(this, config.getFullStackResourceName(this.name, "origin-access-identity")) + bucket.grantRead(originAccessIdentity) - const distributionCertificate = (() => { - if (certificate?.env.region === "us-east-1") return certificate - /** Replace deprecated method when cross-region support is out of beta */ - return new certmgr.DnsValidatedCertificate(this, config.getFullStackResourceName(this.name, "cert"), { - domainName: rootDomain, - subjectAlternativeNames: [`${subdomains.landing}.${rootDomain}`], - hostedZone, - region: "us-east-1" - }) - })() + const distributionCertificate = (() => { + if (certificate?.env.region === "us-east-1") return certificate + /** Replace deprecated method when cross-region support is out of beta */ + return new certmgr.DnsValidatedCertificate(this, config.getFullStackResourceName(this.name, "cert"), { + domainName: rootDomain, + subjectAlternativeNames: [`${subdomains.landing}.${rootDomain}`], + hostedZone, + region: "us-east-1" + }) + })() - const distribution = new cloudfront.Distribution(this, config.getFullStackResourceName(this.name, "distribution"), { - certificate: distributionCertificate, - defaultRootObject: "index.html", - errorResponses: [ - { - httpStatus: 403, - responseHttpStatus: 200, - responsePagePath: "/index.html", - ttl: cdk.Duration.minutes(30) - }, { - httpStatus: 404, - responseHttpStatus: 200, - responsePagePath: "/index.html", - ttl: cdk.Duration.minutes(30) - } - ], - defaultBehavior: { - viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS, - origin: new cloudfrontOrigins.S3Origin(bucket, { originAccessIdentity }) - }, - domainNames: [rootDomain, `${subdomains.landing}.${rootDomain}`] - }) + const distribution = new cloudfront.Distribution(this, config.getFullStackResourceName(this.name, "distribution"), { + certificate: distributionCertificate, + defaultRootObject: "index.html", + errorResponses: [ + { + httpStatus: 403, + responseHttpStatus: 200, + responsePagePath: "/index.html", + ttl: cdk.Duration.minutes(30) + }, { + httpStatus: 404, + responseHttpStatus: 200, + responsePagePath: "/index.html", + ttl: cdk.Duration.minutes(30) + } + ], + defaultBehavior: { + viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS, + origin: new cloudfrontOrigins.S3Origin(bucket, { originAccessIdentity }) + }, + domainNames: [rootDomain, `${subdomains.landing}.${rootDomain}`] + }) - new s3Deployment.BucketDeployment(this, config.getFullStackResourceName(this.name, "bucket-deployment"), { - destinationBucket: bucket, - sources: [s3Deployment.Source.asset("../../apps/landing/dist")], - distribution, - distributionPaths: ["/*"] - }) + new s3Deployment.BucketDeployment(this, config.getFullStackResourceName(this.name, "bucket-deployment"), { + destinationBucket: bucket, + sources: [s3Deployment.Source.asset("../../apps/landing/dist")], + distribution, + distributionPaths: ["/*"] + }) - new route53.ARecord(this, config.getFullStackResourceName(this.name, "a-record"), { - recordName: rootDomain, - zone: hostedZone as route53.IHostedZone, - target: route53.RecordTarget.fromAlias(new route53targets.CloudFrontTarget(distribution)), - ttl: cdk.Duration.minutes(1), - }) + new route53.ARecord(this, config.getFullStackResourceName(this.name, "a-record"), { + recordName: rootDomain, + zone: hostedZone as route53.IHostedZone, + target: route53.RecordTarget.fromAlias(new route53targets.CloudFrontTarget(distribution)), + ttl: cdk.Duration.minutes(1), + }) - new route53.ARecord(this, config.getFullStackResourceName(this.name, "a-record-www"), { - recordName: `${subdomains.landing}.${rootDomain}`, - zone: hostedZone as route53.IHostedZone, - target: route53.RecordTarget.fromAlias(new route53targets.CloudFrontTarget(distribution)), - ttl: cdk.Duration.minutes(1), - }) - } + new route53.ARecord(this, config.getFullStackResourceName(this.name, "a-record-www"), { + recordName: `${subdomains.landing}.${rootDomain}`, + zone: hostedZone as route53.IHostedZone, + target: route53.RecordTarget.fromAlias(new route53targets.CloudFrontTarget(distribution)), + ttl: cdk.Duration.minutes(1), + }) + } } diff --git a/infrastructure/cdk/src/providers/network.ts b/infrastructure/cdk/src/providers/network.ts index 8d894420f..958c8fe2c 100644 --- a/infrastructure/cdk/src/providers/network.ts +++ b/infrastructure/cdk/src/providers/network.ts @@ -9,16 +9,16 @@ import { Config } from "./config" * VPC network stack */ export class NetworkStack extends cdk.Stack { - public readonly name = pascalCase("network") - public readonly vpc: ec2.Vpc + public readonly name = pascalCase("network") + public readonly vpc: ec2.Vpc - constructor(scope: Construct, id: string, props: NetworkStackProps) { - super(scope, id, props) + constructor(scope: Construct, id: string, props: NetworkStackProps) { + super(scope, id, props) - const config = new Config() + const config = new Config() - this.vpc = new ec2.Vpc(this, config.getFullStackResourceName(this.name, "vpc"), { - natGateways: 0 - }) - } + this.vpc = new ec2.Vpc(this, config.getFullStackResourceName(this.name, "vpc"), { + natGateways: 0 + }) + } } \ No newline at end of file diff --git a/infrastructure/cdk/src/providers/nodes.ts b/infrastructure/cdk/src/providers/nodes.ts index 87f7e6954..b14b90a51 100644 --- a/infrastructure/cdk/src/providers/nodes.ts +++ b/infrastructure/cdk/src/providers/nodes.ts @@ -10,23 +10,23 @@ import { Config } from "./config" * Public node stack */ export class NodesStack extends cdk.Stack { - public readonly name = pascalCase("nodes") + public readonly name = pascalCase("nodes") - constructor(scope: Construct, id: string, props: NodesStackProps) { - super(scope, id, props) + constructor(scope: Construct, id: string, props: NodesStackProps) { + super(scope, id, props) - const config = new Config() - const { rootDomain, subdomains } = config - const { hostedZone } = props + const config = new Config() + const { rootDomain, subdomains } = config + const { hostedZone } = props - const nodesIpKey = "casimir-nodes-ip" - const nodesIp = secretsmanager.Secret.fromSecretNameV2(this, pascalCase(nodesIpKey), kebabCase(nodesIpKey)) + const nodesIpKey = "casimir-nodes-ip" + const nodesIp = secretsmanager.Secret.fromSecretNameV2(this, pascalCase(nodesIpKey), kebabCase(nodesIpKey)) - new route53.ARecord(this, config.getFullStackResourceName(this.name, "a-record-api"), { - recordName: `${subdomains.nodes}.${rootDomain}`, - zone: hostedZone as route53.IHostedZone, - target: route53.RecordTarget.fromIpAddresses(nodesIp.secretValue.unsafeUnwrap()), - ttl: cdk.Duration.minutes(1) - }) - } + new route53.ARecord(this, config.getFullStackResourceName(this.name, "a-record-api"), { + recordName: `${subdomains.nodes}.${rootDomain}`, + zone: hostedZone as route53.IHostedZone, + target: route53.RecordTarget.fromIpAddresses(nodesIp.secretValue.unsafeUnwrap()), + ttl: cdk.Duration.minutes(1) + }) + } } \ No newline at end of file diff --git a/infrastructure/cdk/src/providers/users.ts b/infrastructure/cdk/src/providers/users.ts index 743fa66ad..b941ade97 100644 --- a/infrastructure/cdk/src/providers/users.ts +++ b/infrastructure/cdk/src/providers/users.ts @@ -14,112 +14,112 @@ import { kebabCase } from "@casimir/format" * Users service stack */ export class UsersStack extends cdk.Stack { - public readonly name = "users" + public readonly name = "users" - constructor(scope: Construct, id: string, props: UsersStackProps) { - super(scope, id, props) + constructor(scope: Construct, id: string, props: UsersStackProps) { + super(scope, id, props) - const config = new Config() - const { project, stage, rootDomain, subdomains } = config - const { certificate, hostedZone, vpc } = props + const config = new Config() + const { project, stage, rootDomain, subdomains } = config + const { certificate, hostedZone, vpc } = props - const dbCredentials = new secretsmanager.Secret(this, config.getFullStackResourceName(this.name, "db-credentials"), { - secretName: kebabCase(config.getFullStackResourceName(this.name, "db-credentials")), - generateSecretString: { - secretStringTemplate: JSON.stringify({ - username: "postgres" - }), - generateStringKey: "password", - passwordLength: 30, - excludePunctuation: true - } - }) + const dbCredentials = new secretsmanager.Secret(this, config.getFullStackResourceName(this.name, "db-credentials"), { + secretName: kebabCase(config.getFullStackResourceName(this.name, "db-credentials")), + generateSecretString: { + secretStringTemplate: JSON.stringify({ + username: "postgres" + }), + generateStringKey: "password", + passwordLength: 30, + excludePunctuation: true + } + }) - const dbSecurityGroup = new ec2.SecurityGroup(this, config.getFullStackResourceName(this.name, "db-security-group"), { - vpc, - allowAllOutbound: true - }) + const dbSecurityGroup = new ec2.SecurityGroup(this, config.getFullStackResourceName(this.name, "db-security-group"), { + vpc, + allowAllOutbound: true + }) - dbSecurityGroup.addIngressRule(ec2.Peer.anyIpv4(), ec2.Port.tcp(5432)) + dbSecurityGroup.addIngressRule(ec2.Peer.anyIpv4(), ec2.Port.tcp(5432)) - const dbCluster = new rds.DatabaseCluster(this, config.getFullStackResourceName(this.name, "db-cluster"), { - engine: rds.DatabaseClusterEngine.auroraPostgres({ - version: rds.AuroraPostgresEngineVersion.VER_15_2 - }), - credentials: rds.Credentials.fromSecret(dbCredentials), - defaultDatabaseName: this.name, - instances: 1, - instanceProps: { - instanceType: new ec2.InstanceType("serverless"), - publiclyAccessible: true, - securityGroups: [dbSecurityGroup], - vpc, - vpcSubnets: { - subnetType: ec2.SubnetType.PUBLIC - } - }, - port: 5432 - }) + const dbCluster = new rds.DatabaseCluster(this, config.getFullStackResourceName(this.name, "db-cluster"), { + engine: rds.DatabaseClusterEngine.auroraPostgres({ + version: rds.AuroraPostgresEngineVersion.VER_15_2 + }), + credentials: rds.Credentials.fromSecret(dbCredentials), + defaultDatabaseName: this.name, + instances: 1, + instanceProps: { + instanceType: new ec2.InstanceType("serverless"), + publiclyAccessible: true, + securityGroups: [dbSecurityGroup], + vpc, + vpcSubnets: { + subnetType: ec2.SubnetType.PUBLIC + } + }, + port: 5432 + }) - cdk.Aspects.of(dbCluster).add({ - visit(node) { - if (node instanceof rds.CfnDBCluster) { - node.serverlessV2ScalingConfiguration = { - minCapacity: 0.5, - maxCapacity: 1 - } - } - }, - }) + cdk.Aspects.of(dbCluster).add({ + visit(node) { + if (node instanceof rds.CfnDBCluster) { + node.serverlessV2ScalingConfiguration = { + minCapacity: 0.5, + maxCapacity: 1 + } + } + }, + }) - const ecsCluster = new ecs.Cluster(this, config.getFullStackResourceName(this.name, "cluster"), { - vpc - }) + const ecsCluster = new ecs.Cluster(this, config.getFullStackResourceName(this.name, "cluster"), { + vpc + }) - const imageAsset = new ecrAssets.DockerImageAsset(this, config.getFullStackResourceName(this.name, "image"), { - directory: "../../", - file: "services/users/Dockerfile", - platform: ecrAssets.Platform.LINUX_AMD64, - ignoreMode: cdk.IgnoreMode.GIT - }) + const imageAsset = new ecrAssets.DockerImageAsset(this, config.getFullStackResourceName(this.name, "image"), { + directory: "../../", + file: "services/users/Dockerfile", + platform: ecrAssets.Platform.LINUX_AMD64, + ignoreMode: cdk.IgnoreMode.GIT + }) - const requiredSecrets = { - DB_HOST: ecs.Secret.fromSecretsManager(dbCredentials, "host"), - DB_PORT: ecs.Secret.fromSecretsManager(dbCredentials, "port"), - DB_NAME: ecs.Secret.fromSecretsManager(dbCredentials, "dbname"), - DB_USER: ecs.Secret.fromSecretsManager(dbCredentials, "username"), - DB_PASSWORD: ecs.Secret.fromSecretsManager(dbCredentials, "password") - } + const requiredSecrets = { + DB_HOST: ecs.Secret.fromSecretsManager(dbCredentials, "host"), + DB_PORT: ecs.Secret.fromSecretsManager(dbCredentials, "port"), + DB_NAME: ecs.Secret.fromSecretsManager(dbCredentials, "dbname"), + DB_USER: ecs.Secret.fromSecretsManager(dbCredentials, "username"), + DB_PASSWORD: ecs.Secret.fromSecretsManager(dbCredentials, "password") + } - const optionalSecrets: { SESSIONS_HOST?: ecs.Secret, SESSIONS_KEY?: ecs.Secret } = {} + const optionalSecrets: { SESSIONS_HOST?: ecs.Secret, SESSIONS_KEY?: ecs.Secret } = {} - if (config.stage === "prod" || config.stage === "dev") { - const sessionsCredentials = secretsmanager.Secret.fromSecretNameV2(this, config.getFullStackResourceName(this.name, "sessions-credentials"), kebabCase(config.getFullStackResourceName(this.name, "sessions-credentials"))) - optionalSecrets.SESSIONS_HOST = ecs.Secret.fromSecretsManager(sessionsCredentials, "host") - optionalSecrets.SESSIONS_KEY = ecs.Secret.fromSecretsManager(sessionsCredentials, "key") - } + if (config.stage === "prod" || config.stage === "dev") { + const sessionsCredentials = secretsmanager.Secret.fromSecretNameV2(this, config.getFullStackResourceName(this.name, "sessions-credentials"), kebabCase(config.getFullStackResourceName(this.name, "sessions-credentials"))) + optionalSecrets.SESSIONS_HOST = ecs.Secret.fromSecretsManager(sessionsCredentials, "host") + optionalSecrets.SESSIONS_KEY = ecs.Secret.fromSecretsManager(sessionsCredentials, "key") + } - const fargateService = new ecsPatterns.ApplicationLoadBalancedFargateService(this, config.getFullStackResourceName(this.name, "fargate"), { - assignPublicIp: true, - certificate, - cluster: ecsCluster, - domainName: `${subdomains.users}.${rootDomain}`, // e.g. users.casimir.co or users.dev.casimir.co - domainZone: hostedZone, - taskImageOptions: { - containerPort: 4000, - image: ecs.ContainerImage.fromDockerImageAsset(imageAsset), - environment: { - PROJECT: project, - STAGE: stage, - USERS_URL: `https://${subdomains.users}.${rootDomain}`, - WEB_URL: `https://${subdomains.web}.${rootDomain}` - }, - secrets: { ...requiredSecrets, ...optionalSecrets } - } - }) + const fargateService = new ecsPatterns.ApplicationLoadBalancedFargateService(this, config.getFullStackResourceName(this.name, "fargate"), { + assignPublicIp: true, + certificate, + cluster: ecsCluster, + domainName: `${subdomains.users}.${rootDomain}`, // e.g. users.casimir.co or users.dev.casimir.co + domainZone: hostedZone, + taskImageOptions: { + containerPort: 4000, + image: ecs.ContainerImage.fromDockerImageAsset(imageAsset), + environment: { + PROJECT: project, + STAGE: stage, + USERS_URL: `https://${subdomains.users}.${rootDomain}`, + WEB_URL: `https://${subdomains.web}.${rootDomain}` + }, + secrets: { ...requiredSecrets, ...optionalSecrets } + } + }) - fargateService.targetGroup.configureHealthCheck({ - path: "/health" - }) - } + fargateService.targetGroup.configureHealthCheck({ + path: "/health" + }) + } } \ No newline at end of file diff --git a/infrastructure/cdk/src/providers/web.ts b/infrastructure/cdk/src/providers/web.ts index 0ca11bed7..d8c6908e3 100644 --- a/infrastructure/cdk/src/providers/web.ts +++ b/infrastructure/cdk/src/providers/web.ts @@ -15,68 +15,68 @@ import { Config } from "./config" * Web app stack */ export class WebStack extends cdk.Stack { - public readonly name = pascalCase("web") + public readonly name = pascalCase("web") - constructor(scope: Construct, id: string, props: WebStackProps) { - super(scope, id, props) + constructor(scope: Construct, id: string, props: WebStackProps) { + super(scope, id, props) - const config = new Config() - const { rootDomain, subdomains } = config - const { hostedZone, certificate } = props + const config = new Config() + const { rootDomain, subdomains } = config + const { hostedZone, certificate } = props - const bucket = new s3.Bucket(this, config.getFullStackResourceName(this.name, "bucket"), { - accessControl: s3.BucketAccessControl.PRIVATE - }) + const bucket = new s3.Bucket(this, config.getFullStackResourceName(this.name, "bucket"), { + accessControl: s3.BucketAccessControl.PRIVATE + }) - const originAccessIdentity = new cloudfront.OriginAccessIdentity(this, config.getFullStackResourceName(this.name, "origin-access-identity")) - bucket.grantRead(originAccessIdentity) + const originAccessIdentity = new cloudfront.OriginAccessIdentity(this, config.getFullStackResourceName(this.name, "origin-access-identity")) + bucket.grantRead(originAccessIdentity) - const distributionCertificate = (() => { - if (certificate?.env.region === "us-east-1") return certificate - /** Replace deprecated method when cross-region support is out of beta */ - return new certmgr.DnsValidatedCertificate(this, config.getFullStackResourceName(this.name, "cert"), { - domainName: rootDomain, - subjectAlternativeNames: [`${subdomains.web}.${rootDomain}`], - hostedZone, - region: "us-east-1" - }) - })() + const distributionCertificate = (() => { + if (certificate?.env.region === "us-east-1") return certificate + /** Replace deprecated method when cross-region support is out of beta */ + return new certmgr.DnsValidatedCertificate(this, config.getFullStackResourceName(this.name, "cert"), { + domainName: rootDomain, + subjectAlternativeNames: [`${subdomains.web}.${rootDomain}`], + hostedZone, + region: "us-east-1" + }) + })() - const distribution = new cloudfront.Distribution(this, config.getFullStackResourceName(this.name, "distribution"), { - certificate: distributionCertificate, - defaultRootObject: "index.html", - errorResponses: [ - { - httpStatus: 403, - responseHttpStatus: 200, - responsePagePath: "/index.html", - ttl: cdk.Duration.minutes(30) - }, { - httpStatus: 404, - responseHttpStatus: 200, - responsePagePath: "/index.html", - ttl: cdk.Duration.minutes(30) - } - ], - defaultBehavior: { - viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS, - origin: new cloudfrontOrigins.S3Origin(bucket, { originAccessIdentity }) - }, - domainNames: [`${subdomains.web}.${rootDomain}`] - }) + const distribution = new cloudfront.Distribution(this, config.getFullStackResourceName(this.name, "distribution"), { + certificate: distributionCertificate, + defaultRootObject: "index.html", + errorResponses: [ + { + httpStatus: 403, + responseHttpStatus: 200, + responsePagePath: "/index.html", + ttl: cdk.Duration.minutes(30) + }, { + httpStatus: 404, + responseHttpStatus: 200, + responsePagePath: "/index.html", + ttl: cdk.Duration.minutes(30) + } + ], + defaultBehavior: { + viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS, + origin: new cloudfrontOrigins.S3Origin(bucket, { originAccessIdentity }) + }, + domainNames: [`${subdomains.web}.${rootDomain}`] + }) - new s3Deployment.BucketDeployment(this, config.getFullStackResourceName(this.name, "bucket-deployment"), { - destinationBucket: bucket, - sources: [s3Deployment.Source.asset("../../apps/web/dist")], - distribution, - distributionPaths: ["/*"] - }) + new s3Deployment.BucketDeployment(this, config.getFullStackResourceName(this.name, "bucket-deployment"), { + destinationBucket: bucket, + sources: [s3Deployment.Source.asset("../../apps/web/dist")], + distribution, + distributionPaths: ["/*"] + }) - new route53.ARecord(this, config.getFullStackResourceName(this.name, "a-record-app"), { - recordName: `${subdomains.web}.${rootDomain}`, - zone: hostedZone as route53.IHostedZone, - target: route53.RecordTarget.fromAlias(new route53targets.CloudFrontTarget(distribution)), - ttl: cdk.Duration.minutes(1), - }) - } + new route53.ARecord(this, config.getFullStackResourceName(this.name, "a-record-app"), { + recordName: `${subdomains.web}.${rootDomain}`, + zone: hostedZone as route53.IHostedZone, + target: route53.RecordTarget.fromAlias(new route53targets.CloudFrontTarget(distribution)), + ttl: cdk.Duration.minutes(1), + }) + } } \ No newline at end of file diff --git a/infrastructure/cdk/test/all.test.ts b/infrastructure/cdk/test/all.test.ts index 28c7d4a49..a114f29cc 100644 --- a/infrastructure/cdk/test/all.test.ts +++ b/infrastructure/cdk/test/all.test.ts @@ -12,53 +12,53 @@ import { UsersStack } from "../src/providers/users" import { WebStack } from "../src/providers/web" test("All stacks created", () => { - const config = new Config() - const { env } = config - const app = new cdk.App() + const config = new Config() + const { env } = config + const app = new cdk.App() - const { hostedZone, certificate } = new DnsStack(app, config.getFullStackName("dns"), { env }) - const { vpc } = new NetworkStack(app, config.getFullStackName("network"), { env }) + const { hostedZone, certificate } = new DnsStack(app, config.getFullStackName("dns"), { env }) + const { vpc } = new NetworkStack(app, config.getFullStackName("network"), { env }) - const analyticsStack = new AnalyticsStack(app, config.getFullStackName("analytics"), { env }) - const blogStack = new BlogStack(app, config.getFullStackName("blog"), { env, certificate, hostedZone, vpc }) - const docsStack = new DocsStack(app, config.getFullStackName("docs"), { env, certificate, hostedZone }) - const landingStack = new LandingStack(app, config.getFullStackName("landing"), { env, certificate, hostedZone }) - const nodesStack = new NodesStack(app, config.getFullStackName("nodes"), { env, hostedZone }) - const usersStack = new UsersStack(app, config.getFullStackName("users"), { env, certificate, hostedZone, vpc }) - const webStack = new WebStack(app, config.getFullStackName("web"), { env, certificate, hostedZone }) + const analyticsStack = new AnalyticsStack(app, config.getFullStackName("analytics"), { env }) + const blogStack = new BlogStack(app, config.getFullStackName("blog"), { env, certificate, hostedZone, vpc }) + const docsStack = new DocsStack(app, config.getFullStackName("docs"), { env, certificate, hostedZone }) + const landingStack = new LandingStack(app, config.getFullStackName("landing"), { env, certificate, hostedZone }) + const nodesStack = new NodesStack(app, config.getFullStackName("nodes"), { env, hostedZone }) + const usersStack = new UsersStack(app, config.getFullStackName("users"), { env, certificate, hostedZone, vpc }) + const webStack = new WebStack(app, config.getFullStackName("web"), { env, certificate, hostedZone }) - const analyticsTemplate = assertions.Template.fromStack(analyticsStack) - Object.keys(analyticsTemplate.findOutputs("*")).forEach(output => { - expect(output).toBeDefined() - }) + const analyticsTemplate = assertions.Template.fromStack(analyticsStack) + Object.keys(analyticsTemplate.findOutputs("*")).forEach(output => { + expect(output).toBeDefined() + }) - const blogTemplate = assertions.Template.fromStack(blogStack) - Object.keys(blogTemplate.findOutputs("*")).forEach(output => { - expect(output).toBeDefined() - }) + const blogTemplate = assertions.Template.fromStack(blogStack) + Object.keys(blogTemplate.findOutputs("*")).forEach(output => { + expect(output).toBeDefined() + }) - const docsTemplate = assertions.Template.fromStack(docsStack) - Object.keys(docsTemplate.findOutputs("*")).forEach(output => { - expect(output).toBeDefined() - }) + const docsTemplate = assertions.Template.fromStack(docsStack) + Object.keys(docsTemplate.findOutputs("*")).forEach(output => { + expect(output).toBeDefined() + }) - const landingTemplate = assertions.Template.fromStack(landingStack) - Object.keys(landingTemplate.findOutputs("*")).forEach(output => { - expect(output).toBeDefined() - }) + const landingTemplate = assertions.Template.fromStack(landingStack) + Object.keys(landingTemplate.findOutputs("*")).forEach(output => { + expect(output).toBeDefined() + }) - const nodesTemplate = assertions.Template.fromStack(nodesStack) - Object.keys(nodesTemplate.findOutputs("*")).forEach(output => { - expect(output).toBeDefined() - }) + const nodesTemplate = assertions.Template.fromStack(nodesStack) + Object.keys(nodesTemplate.findOutputs("*")).forEach(output => { + expect(output).toBeDefined() + }) - const usersTemplate = assertions.Template.fromStack(usersStack) - Object.keys(usersTemplate.findOutputs("*")).forEach(output => { - expect(output).toBeDefined() - }) + const usersTemplate = assertions.Template.fromStack(usersStack) + Object.keys(usersTemplate.findOutputs("*")).forEach(output => { + expect(output).toBeDefined() + }) - const webTemplate = assertions.Template.fromStack(webStack) - Object.keys(webTemplate.findOutputs("*")).forEach(output => { - expect(output).toBeDefined() - }) + const webTemplate = assertions.Template.fromStack(webStack) + Object.keys(webTemplate.findOutputs("*")).forEach(output => { + expect(output).toBeDefined() + }) }) diff --git a/infrastructure/cdk/test/analytics.test.ts b/infrastructure/cdk/test/analytics.test.ts index c558d4b16..5f397f689 100644 --- a/infrastructure/cdk/test/analytics.test.ts +++ b/infrastructure/cdk/test/analytics.test.ts @@ -5,42 +5,42 @@ import { AnalyticsStack } from "../src/providers/analytics" import { Schema, eventSchema, actionSchema } from "@casimir/data" test("Analytics stack created", () => { - const config = new Config() - const { env } = config - const app = new cdk.App() + const config = new Config() + const { env } = config + const app = new cdk.App() - const analyticsStack = new AnalyticsStack(app, config.getFullStackName("analytics"), { env }) - const analyticsTemplate = assertions.Template.fromStack(analyticsStack) - Object.keys(analyticsTemplate.findOutputs("*")).forEach(output => { - expect(output).toBeDefined() - }) + const analyticsStack = new AnalyticsStack(app, config.getFullStackName("analytics"), { env }) + const analyticsTemplate = assertions.Template.fromStack(analyticsStack) + Object.keys(analyticsTemplate.findOutputs("*")).forEach(output => { + expect(output).toBeDefined() + }) - const resource = analyticsTemplate.findResources("AWS::Glue::Table") + const resource = analyticsTemplate.findResources("AWS::Glue::Table") - const eventTable = Object.keys(resource).filter(key => key.includes("EventTable")) - const eventColumns = resource[eventTable[0]].Properties.TableInput.StorageDescriptor.Columns - const eventGlueSchema = new Schema(eventSchema).getGlueColumns() + const eventTable = Object.keys(resource).filter(key => key.includes("EventTable")) + const eventColumns = resource[eventTable[0]].Properties.TableInput.StorageDescriptor.Columns + const eventGlueSchema = new Schema(eventSchema).getGlueColumns() - for (const column of eventColumns) { - const { Name: name, Type: type } = column - const columnName = Object.keys(eventSchema.properties).filter(key => key === name)[0] - const columnType = eventGlueSchema.filter(key => key.name === name)[0].type.inputString + for (const column of eventColumns) { + const { Name: name, Type: type } = column + const columnName = Object.keys(eventSchema.properties).filter(key => key === name)[0] + const columnType = eventGlueSchema.filter(key => key.name === name)[0].type.inputString - expect(columnType).toEqual(type) - expect(columnName).toEqual(name) - } + expect(columnType).toEqual(type) + expect(columnName).toEqual(name) + } - const actionTable = Object.keys(resource).filter(key => key.includes("ActionTable"))[0] - const actionColumns = resource[actionTable].Properties.TableInput.StorageDescriptor.Columns - const actionGlueSchema = new Schema(actionSchema).getGlueColumns() + const actionTable = Object.keys(resource).filter(key => key.includes("ActionTable"))[0] + const actionColumns = resource[actionTable].Properties.TableInput.StorageDescriptor.Columns + const actionGlueSchema = new Schema(actionSchema).getGlueColumns() - for (const column of actionColumns) { - const { Name: name, Type: type } = column - const columnName = Object.keys(actionSchema.properties).filter(key => key === name)[0] - const columnType = actionGlueSchema.filter(key => key.name === name)[0].type.inputString + for (const column of actionColumns) { + const { Name: name, Type: type } = column + const columnName = Object.keys(actionSchema.properties).filter(key => key === name)[0] + const columnType = actionGlueSchema.filter(key => key.name === name)[0].type.inputString - expect(columnType).toEqual(type) - expect(columnName).toEqual(name) - } + expect(columnType).toEqual(type) + expect(columnName).toEqual(name) + } }) \ No newline at end of file diff --git a/scripts/actions/test.ts b/scripts/actions/test.ts index 3f189d2a0..d8a943aab 100755 --- a/scripts/actions/test.ts +++ b/scripts/actions/test.ts @@ -6,12 +6,12 @@ import { run } from "@casimir/shell" */ void async function () { - const workflow = process.env.WORKFLOW || "push" + const workflow = process.env.WORKFLOW || "push" - const { accessKeyId, secretAccessKey } = await loadCredentials() + const { accessKeyId, secretAccessKey } = await loadCredentials() - const slackWebhookURL = process.env.SLACK_WEBHOOK_URL + const slackWebhookURL = process.env.SLACK_WEBHOOK_URL - console.log(`🚀 Running ${workflow} workflow`) - await run(`act ${workflow} --rebuild --secret AWS_ACCESS_KEY_ID=${accessKeyId} --secret AWS_SECRET_ACCESS_KEY=${secretAccessKey} --secret SLACK_WEBHOOK_URL=${slackWebhookURL}`) + console.log(`🚀 Running ${workflow} workflow`) + await run(`act ${workflow} --rebuild --secret AWS_ACCESS_KEY_ID=${accessKeyId} --secret AWS_SECRET_ACCESS_KEY=${secretAccessKey} --secret SLACK_WEBHOOK_URL=${slackWebhookURL}`) }() \ No newline at end of file diff --git a/scripts/cdk/deploy.ts b/scripts/cdk/deploy.ts index e061e8425..0e3668b46 100755 --- a/scripts/cdk/deploy.ts +++ b/scripts/cdk/deploy.ts @@ -6,53 +6,53 @@ import { run } from "@casimir/shell" * Deploy CDK stacks */ void async function () { - process.env.PROJECT = process.env.PROJECT || "casimir" - process.env.STAGE = process.env.STAGE || "dev" - process.env.AWS_REGION = process.env.AWS_REGION || "us-east-2" + process.env.PROJECT = process.env.PROJECT || "casimir" + process.env.STAGE = process.env.STAGE || "dev" + process.env.AWS_REGION = process.env.AWS_REGION || "us-east-2" - await loadCredentials() - process.env.AWS_ACCOUNT = await getSecret("casimir-aws-account") - - // Hardcode app url to dev in prod to link goerli testnet - process.env.APP_URL = process.env.STAGE === "prod" ? /*'https://app.casimir.co'*/"https://app.dev.casimir.co" : `https://app.${process.env.STAGE}.casimir.co` - process.env.BLOG_URL = process.env.STAGE === "prod" ? "https://blog.casimir.co" : `https://blog.${process.env.STAGE}.casimir.co` - process.env.DOCS_URL = process.env.STAGE === "prod" ? "https://docs.casimir.co" : `https://docs.${process.env.STAGE}.casimir.co` - process.env.USERS_URL = process.env.STAGE === "prod" ? "https://users.casimir.co" : `https://users.${process.env.STAGE}.casimir.co` - process.env.WEBSITE_URL = process.env.STAGE === "prod" ? "https://casimir.co" : `https://${process.env.STAGE}.casimir.co` - process.env.CRYPTO_COMPARE_API_KEY = await getSecret("casimir-crypto-compare-api-key") - - const networkKey = process.env.NETWORK?.toUpperCase() || process.env.FORK?.toUpperCase() || "TESTNET" - process.env.ETHEREUM_RPC_URL = ETHEREUM_RPC_URL[networkKey] - process.env.FACTORY_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.FACTORY_ADDRESS - process.env.SSV_NETWORK_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_NETWORK_ADDRESS - process.env.SSV_VIEWS_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_VIEWS_ADDRESS + await loadCredentials() + process.env.AWS_ACCOUNT = await getSecret("casimir-aws-account") + + // Hardcode app url to dev in prod to link goerli testnet + process.env.APP_URL = process.env.STAGE === "prod" ? /*'https://app.casimir.co'*/"https://app.dev.casimir.co" : `https://app.${process.env.STAGE}.casimir.co` + process.env.BLOG_URL = process.env.STAGE === "prod" ? "https://blog.casimir.co" : `https://blog.${process.env.STAGE}.casimir.co` + process.env.DOCS_URL = process.env.STAGE === "prod" ? "https://docs.casimir.co" : `https://docs.${process.env.STAGE}.casimir.co` + process.env.USERS_URL = process.env.STAGE === "prod" ? "https://users.casimir.co" : `https://users.${process.env.STAGE}.casimir.co` + process.env.WEBSITE_URL = process.env.STAGE === "prod" ? "https://casimir.co" : `https://${process.env.STAGE}.casimir.co` + process.env.CRYPTO_COMPARE_API_KEY = await getSecret("casimir-crypto-compare-api-key") + + const networkKey = process.env.NETWORK?.toUpperCase() || process.env.FORK?.toUpperCase() || "TESTNET" + process.env.ETHEREUM_RPC_URL = ETHEREUM_RPC_URL[networkKey] + process.env.FACTORY_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.FACTORY_ADDRESS + process.env.SSV_NETWORK_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_NETWORK_ADDRESS + process.env.SSV_VIEWS_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_VIEWS_ADDRESS - process.env.PUBLIC_APP_URL = process.env.APP_URL - process.env.PUBLIC_BLOG_URL = process.env.BLOG_URL - process.env.PUBLIC_DOCS_URL = process.env.DOCS_URL - process.env.PUBLIC_USERS_URL = process.env.USERS_URL - process.env.PUBLIC_WEBSITE_URL = process.env.WEBSITE_URL - process.env.PUBLIC_CRYPTO_COMPARE_API_KEY = process.env.CRYPTO_COMPARE_API_KEY - process.env.PUBLIC_ETHEREUM_RPC_URL = process.env.ETHEREUM_RPC_URL - process.env.PUBLIC_FACTORY_ADDRESS = process.env.FACTORY_ADDRESS - process.env.PUBLIC_SSV_NETWORK_ADDRESS = process.env.SSV_NETWORK_ADDRESS - process.env.PUBLIC_SSV_VIEWS_ADDRESS = process.env.SSV_VIEWS_ADDRESS - process.env.PUBLIC_CRYPTO_COMPARE_API_KEY = await getSecret("casimir-crypto-compare-api-key") - process.env.PUBLIC_WALLET_CONNECT_PROJECT_ID = await getSecret("casimir-wallet-connect-project-id") + process.env.PUBLIC_APP_URL = process.env.APP_URL + process.env.PUBLIC_BLOG_URL = process.env.BLOG_URL + process.env.PUBLIC_DOCS_URL = process.env.DOCS_URL + process.env.PUBLIC_USERS_URL = process.env.USERS_URL + process.env.PUBLIC_WEBSITE_URL = process.env.WEBSITE_URL + process.env.PUBLIC_CRYPTO_COMPARE_API_KEY = process.env.CRYPTO_COMPARE_API_KEY + process.env.PUBLIC_ETHEREUM_RPC_URL = process.env.ETHEREUM_RPC_URL + process.env.PUBLIC_FACTORY_ADDRESS = process.env.FACTORY_ADDRESS + process.env.PUBLIC_SSV_NETWORK_ADDRESS = process.env.SSV_NETWORK_ADDRESS + process.env.PUBLIC_SSV_VIEWS_ADDRESS = process.env.SSV_VIEWS_ADDRESS + process.env.PUBLIC_CRYPTO_COMPARE_API_KEY = await getSecret("casimir-crypto-compare-api-key") + process.env.PUBLIC_WALLET_CONNECT_PROJECT_ID = await getSecret("casimir-wallet-connect-project-id") - await run("npm run build --workspace @casimir/ethereum") - await run("npm run docgen --workspace @casimir/docs") - await run("npm run build --workspace @casimir/docs") - await run("npm run build --workspace @casimir/redirect") - await run("npm run build --workspace @casimir/landing") - await run("npm run build --workspace @casimir/users") - await run("npm run build --workspace @casimir/web") - - await run("npm run bootstrap --workspace @casimir/cdk") - await run("npm run synth --workspace @casimir/cdk") - - console.log("🚀 Deploying CDK app") - await run("npm run deploy --workspace @casimir/cdk") + await run("npm run build --workspace @casimir/ethereum") + await run("npm run docgen --workspace @casimir/docs") + await run("npm run build --workspace @casimir/docs") + await run("npm run build --workspace @casimir/redirect") + await run("npm run build --workspace @casimir/landing") + await run("npm run build --workspace @casimir/users") + await run("npm run build --workspace @casimir/web") + + await run("npm run bootstrap --workspace @casimir/cdk") + await run("npm run synth --workspace @casimir/cdk") + + console.log("🚀 Deploying CDK app") + await run("npm run deploy --workspace @casimir/cdk") }() diff --git a/scripts/cdk/test.ts b/scripts/cdk/test.ts index eef541d3a..b36adff79 100644 --- a/scripts/cdk/test.ts +++ b/scripts/cdk/test.ts @@ -5,21 +5,21 @@ import { run } from "@casimir/shell" * Test CDK stacks */ void async function () { - process.env.PROJECT = process.env.PROJECT || "casimir" - process.env.STAGE = process.env.STAGE || "dev" - process.env.AWS_REGION = process.env.AWS_REGION || "us-east-2" + process.env.PROJECT = process.env.PROJECT || "casimir" + process.env.STAGE = process.env.STAGE || "dev" + process.env.AWS_REGION = process.env.AWS_REGION || "us-east-2" - await loadCredentials() - process.env.AWS_ACCOUNT = await getSecret("casimir-aws-account") + await loadCredentials() + process.env.AWS_ACCOUNT = await getSecret("casimir-aws-account") - await run("npm run build --workspace @casimir/ethereum") - await run("npm run docgen --workspace @casimir/docs") - await run("npm run build --workspace @casimir/docs") - await run("npm run build --workspace @casimir/redirect") - await run("npm run build --workspace @casimir/landing") - await run("npm run build --workspace @casimir/users") - await run("npm run build --workspace @casimir/web") + await run("npm run build --workspace @casimir/ethereum") + await run("npm run docgen --workspace @casimir/docs") + await run("npm run build --workspace @casimir/docs") + await run("npm run build --workspace @casimir/redirect") + await run("npm run build --workspace @casimir/landing") + await run("npm run build --workspace @casimir/users") + await run("npm run build --workspace @casimir/web") - console.log("🚀 Testing CDK app") - await run("npm run test --workspace @casimir/cdk") + console.log("🚀 Testing CDK app") + await run("npm run test --workspace @casimir/cdk") }() \ No newline at end of file diff --git a/scripts/ethereum/debug.ts b/scripts/ethereum/debug.ts index b11282e95..9cd90330b 100644 --- a/scripts/ethereum/debug.ts +++ b/scripts/ethereum/debug.ts @@ -6,28 +6,29 @@ import { run } from "@casimir/shell" * Test ethereum contracts and services */ void async function () { - if (process.env.USE_SECRETS !== "false") { - await loadCredentials() - process.env.BIP39_SEED = process.env.BIP39_SEED || await getSecret("consensus-networks-bip39-seed") as string - } else { - process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" - } - console.log(`Your mnemonic is ${process.env.BIP39_SEED}`) + if (process.env.USE_SECRETS !== "false") { + await loadCredentials() + process.env.BIP39_SEED = process.env.BIP39_SEED || await getSecret("consensus-networks-bip39-seed") as string + } else { + process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" + } + console.log(`Your mnemonic is ${process.env.BIP39_SEED}`) - process.env.FORK = process.env.FORK || "testnet" + process.env.FORK = process.env.FORK || "testnet" - process.env.ETHEREUM_FORK_RPC_URL = process.env.ETHEREUM_FORK_RPC_URL || ETHEREUM_RPC_URL[process.env.FORK.toUpperCase()] - if (!process.env.ETHEREUM_FORK_RPC_URL) { - throw new Error(`Ethereum ${process.env.FORK} is not supported`) - } + process.env.ETHEREUM_FORK_RPC_URL = + process.env.ETHEREUM_FORK_RPC_URL || ETHEREUM_RPC_URL[process.env.FORK.toUpperCase()] + if (!process.env.ETHEREUM_FORK_RPC_URL) { + throw new Error(`Ethereum ${process.env.FORK} is not supported`) + } - const networkName = ETHEREUM_NETWORK_NAME[process.env.FORK.toUpperCase()] + const networkName = ETHEREUM_NETWORK_NAME[process.env.FORK.toUpperCase()] - console.log(`Using ${networkName} fork from ${process.env.ETHEREUM_FORK_RPC_URL}`) + console.log(`Using ${networkName} fork from ${process.env.ETHEREUM_FORK_RPC_URL}`) - process.env.SSV_NETWORK_ADDRESS = ETHEREUM_CONTRACTS[process.env.FORK.toUpperCase()]?.SSV_NETWORK_ADDRESS - process.env.SSV_VIEWS_ADDRESS = ETHEREUM_CONTRACTS[process.env.FORK.toUpperCase()]?.SSV_VIEWS_ADDRESS - process.env.SWAP_FACTORY_ADDRESS = ETHEREUM_CONTRACTS[process.env.FORK.toUpperCase()]?.SWAP_FACTORY_ADDRESS + process.env.SSV_NETWORK_ADDRESS = ETHEREUM_CONTRACTS[process.env.FORK.toUpperCase()]?.SSV_NETWORK_ADDRESS + process.env.SSV_VIEWS_ADDRESS = ETHEREUM_CONTRACTS[process.env.FORK.toUpperCase()]?.SSV_VIEWS_ADDRESS + process.env.SWAP_FACTORY_ADDRESS = ETHEREUM_CONTRACTS[process.env.FORK.toUpperCase()]?.SWAP_FACTORY_ADDRESS - run("npm run test:debug --workspace @casimir/ethereum") + run("npm run test:debug --workspace @casimir/ethereum") }() diff --git a/scripts/ethereum/deploy.ts b/scripts/ethereum/deploy.ts index 03f7e513e..ee2e9b5f8 100644 --- a/scripts/ethereum/deploy.ts +++ b/scripts/ethereum/deploy.ts @@ -6,19 +6,19 @@ import { run } from "@casimir/shell" * Deploy ethereum contracts */ void async function () { - if (process.env.USE_SECRETS !== "false") { - await loadCredentials() - process.env.BIP39_SEED = process.env.BIP39_SEED || await getSecret("consensus-networks-bip39-seed") as string - } else { - process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" - } - console.log(`Your mnemonic seed is ${process.env.BIP39_SEED}`) + if (process.env.USE_SECRETS !== "false") { + await loadCredentials() + process.env.BIP39_SEED = process.env.BIP39_SEED || await getSecret("consensus-networks-bip39-seed") as string + } else { + process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" + } + console.log(`Your mnemonic seed is ${process.env.BIP39_SEED}`) - process.env.NETWORK = process.env.NETWORK || "testnet" - process.env.ETHEREUM_RPC_URL = ETHEREUM_RPC_URL[process.env.NETWORK.toUpperCase()] - const networkName = ETHEREUM_NETWORK_NAME[process.env.NETWORK.toUpperCase()] + process.env.NETWORK = process.env.NETWORK || "testnet" + process.env.ETHEREUM_RPC_URL = ETHEREUM_RPC_URL[process.env.NETWORK.toUpperCase()] + const networkName = ETHEREUM_NETWORK_NAME[process.env.NETWORK.toUpperCase()] - console.log(`Using ${networkName} network from ${process.env.ETHEREUM_RPC_URL}`) + console.log(`Using ${networkName} network from ${process.env.ETHEREUM_RPC_URL}`) - run(`npm run deploy --workspace @casimir/ethereum -- --network ${networkName}`) + run(`npm run deploy --workspace @casimir/ethereum -- --network ${networkName}`) }() diff --git a/scripts/ethereum/report.ts b/scripts/ethereum/report.ts index 24d4c0cab..33d21a376 100644 --- a/scripts/ethereum/report.ts +++ b/scripts/ethereum/report.ts @@ -6,17 +6,17 @@ import { run } from "@casimir/shell" * Run an ethereum development environment */ void async function () { - if (process.env.USE_SECRETS !== "false") { - await loadCredentials() - process.env.BIP39_SEED = process.env.BIP39_SEED || await getSecret("consensus-networks-bip39-seed") as string - } else { - process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" - } - console.log(`Your mnemonic seed is ${process.env.BIP39_SEED}`) + if (process.env.USE_SECRETS !== "false") { + await loadCredentials() + process.env.BIP39_SEED = process.env.BIP39_SEED || await getSecret("consensus-networks-bip39-seed") as string + } else { + process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" + } + console.log(`Your mnemonic seed is ${process.env.BIP39_SEED}`) - process.env.SSV_NETWORK_ADDRESS = ETHEREUM_CONTRACTS["TESTNET"].SSV_NETWORK_ADDRESS - process.env.SSV_VIEWS_ADDRESS = ETHEREUM_CONTRACTS["TESTNET"].SSV_VIEWS_ADDRESS - process.env.SWAP_FACTORY_ADDRESS = ETHEREUM_CONTRACTS["TESTNET"].SWAP_FACTORY_ADDRESS + process.env.SSV_NETWORK_ADDRESS = ETHEREUM_CONTRACTS["TESTNET"].SSV_NETWORK_ADDRESS + process.env.SSV_VIEWS_ADDRESS = ETHEREUM_CONTRACTS["TESTNET"].SSV_VIEWS_ADDRESS + process.env.SWAP_FACTORY_ADDRESS = ETHEREUM_CONTRACTS["TESTNET"].SWAP_FACTORY_ADDRESS - run(`npm run report --workspace @casimir/ethereum -- --network ${ETHEREUM_NETWORK_NAME["TESTNET"]}`) + run(`npm run report --workspace @casimir/ethereum -- --network ${ETHEREUM_NETWORK_NAME["TESTNET"]}`) }() diff --git a/scripts/ethereum/upgrade.ts b/scripts/ethereum/upgrade.ts index 4971e3474..c15477756 100644 --- a/scripts/ethereum/upgrade.ts +++ b/scripts/ethereum/upgrade.ts @@ -6,22 +6,22 @@ import { run } from "@casimir/shell" * Upgrade ethereum contracts */ void async function () { - if (process.env.USE_SECRETS !== "false") { - await loadCredentials() - process.env.BIP39_SEED = process.env.BIP39_SEED || await getSecret("consensus-networks-bip39-seed") as string - } else { - process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" - } - console.log(`Your mnemonic seed is ${process.env.BIP39_SEED}`) + if (process.env.USE_SECRETS !== "false") { + await loadCredentials() + process.env.BIP39_SEED = process.env.BIP39_SEED || await getSecret("consensus-networks-bip39-seed") as string + } else { + process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" + } + console.log(`Your mnemonic seed is ${process.env.BIP39_SEED}`) - process.env.NETWORK = process.env.NETWORK || "testnet" - process.env.ETHEREUM_RPC_URL = ETHEREUM_RPC_URL[process.env.NETWORK.toUpperCase()] - const networkName = ETHEREUM_NETWORK_NAME[process.env.NETWORK.toUpperCase()] + process.env.NETWORK = process.env.NETWORK || "testnet" + process.env.ETHEREUM_RPC_URL = ETHEREUM_RPC_URL[process.env.NETWORK.toUpperCase()] + const networkName = ETHEREUM_NETWORK_NAME[process.env.NETWORK.toUpperCase()] - console.log(`Using ${networkName} network from ${process.env.ETHEREUM_RPC_URL}`) + console.log(`Using ${networkName} network from ${process.env.ETHEREUM_RPC_URL}`) - run(`npm run upgrade:proxies --workspace @casimir/ethereum -- --network ${networkName}`) + run(`npm run upgrade:proxies --workspace @casimir/ethereum -- --network ${networkName}`) - // Instead to upgrade all contracts including mocks and libraries - // run(`npm run upgrade:all --workspace @casimir/ethereum -- --network ${networkName}`) + // Instead to upgrade all contracts including mocks and libraries + // run(`npm run upgrade:all --workspace @casimir/ethereum -- --network ${networkName}`) }() \ No newline at end of file diff --git a/scripts/migrations/users.ts b/scripts/migrations/users.ts index d4d29ba4c..95cf319a4 100644 --- a/scripts/migrations/users.ts +++ b/scripts/migrations/users.ts @@ -8,45 +8,45 @@ import { getSecret } from "@casimir/aws" * Generate SQL schema from JSON schemas */ void async function () { - const project = process.env.PROJECT || "casimir" - const stage = process.env.STAGE || "dev" - const dbName = "users" + const project = process.env.PROJECT || "casimir" + const stage = process.env.STAGE || "dev" + const dbName = "users" - const dbCredentials = await getSecret(`${project}-${dbName}-db-credentials-${stage}`) + const dbCredentials = await getSecret(`${project}-${dbName}-db-credentials-${stage}`) - const { port, host, username, password } = JSON.parse(dbCredentials as string) - const pgUrl = `postgres://${username}:${password}@${host}:${port}/${dbName}` + const { port, host, username, password } = JSON.parse(dbCredentials as string) + const pgUrl = `postgres://${username}:${password}@${host}:${port}/${dbName}` - const resourceDir = "./scripts" + const resourceDir = "./scripts" - const tableSchemas = { - account: accountSchema, - operator: operatorSchema, - nonce: nonceSchema, - user: userSchema, - userAccount: userAccountSchema - } + const tableSchemas = { + account: accountSchema, + operator: operatorSchema, + nonce: nonceSchema, + user: userSchema, + userAccount: userAccountSchema + } - let sqlSchema = "" - for (const table of Object.keys(tableSchemas)) { - const tableSchema = tableSchemas[table] as JsonSchema - const schema = new Schema(tableSchema) - const postgresTable = schema.getPostgresTable() - console.log(`${schema.getTitle()} JSON schema parsed to SQL`) - sqlSchema += `${postgresTable}\n\n` - } + let sqlSchema = "" + for (const table of Object.keys(tableSchemas)) { + const tableSchema = tableSchemas[table] as JsonSchema + const schema = new Schema(tableSchema) + const postgresTable = schema.getPostgresTable() + console.log(`${schema.getTitle()} JSON schema parsed to SQL`) + sqlSchema += `${postgresTable}\n\n` + } - const sqlDir = `${resourceDir}/.out/sql` - if (!fs.existsSync(sqlDir)) fs.mkdirSync(sqlDir, { recursive: true }) - fs.writeFileSync(`${sqlDir}/schema.sql`, sqlSchema) + const sqlDir = `${resourceDir}/.out/sql` + if (!fs.existsSync(sqlDir)) fs.mkdirSync(sqlDir, { recursive: true }) + fs.writeFileSync(`${sqlDir}/schema.sql`, sqlSchema) - const atlas = await run("which atlas") as string - if (!atlas || atlas.includes("not found")) { - if (os.platform() === "darwin") { - await run("echo y | brew install atlas") - } else { - throw new Error("Please install atlas using `curl -sSf https://atlasgo.sh | sh`") + const atlas = await run("which atlas") as string + if (!atlas || atlas.includes("not found")) { + if (os.platform() === "darwin") { + await run("echo y | brew install atlas") + } else { + throw new Error("Please install atlas using `curl -sSf https://atlasgo.sh | sh`") + } } - } - await run(`atlas schema apply --url "${pgUrl}?sslmode=disable" --to "file://${sqlDir}/schema.sql" --dev-url "docker://postgres/15" --auto-approve`) + await run(`atlas schema apply --url "${pgUrl}?sslmode=disable" --to "file://${sqlDir}/schema.sql" --dev-url "docker://postgres/15" --auto-approve`) }() \ No newline at end of file diff --git a/scripts/root/check.ts b/scripts/root/check.ts index 8a35e4fb1..eee51bc87 100644 --- a/scripts/root/check.ts +++ b/scripts/root/check.ts @@ -5,60 +5,60 @@ import fs from "fs" * Check environment prerequisites */ void async function () { - if (process.env.CI !== "true") { - const docker = await run("docker --version") as string - try { - const dockerSplit = docker.split(" ") - const dockerNumber = dockerSplit[2] - const dockerNumberSplit = dockerNumber.split(".") - const dockerMajor = parseInt(dockerNumberSplit[0]) - if (dockerMajor < 24) { - throw new Error("🚩 Incompatible docker version") - } - } catch (error) { - console.error(error.message) - throw new Error("🚩 Please install docker 24.x (see https://github.com/consensusnetworks/casimir#prerequisites #1)") - } + if (process.env.CI !== "true") { + const docker = await run("docker --version") as string + try { + const dockerSplit = docker.split(" ") + const dockerNumber = dockerSplit[2] + const dockerNumberSplit = dockerNumber.split(".") + const dockerMajor = parseInt(dockerNumberSplit[0]) + if (dockerMajor < 24) { + throw new Error("🚩 Incompatible docker version") + } + } catch (error) { + console.error(error.message) + throw new Error("🚩 Please install docker 24.x (see https://github.com/consensusnetworks/casimir#prerequisites #1)") + } - const submodules = fs.readFileSync(".gitmodules", "utf8") - const submoduleDirs = submodules.match(/path = (.*)/g)?.map((path) => path.replace("path = ", "")) - if (submoduleDirs) { - try { - for (const dir of submoduleDirs) { - const content = fs.readdirSync(dir) - if (!content.length) { - throw new Error("🚩 Missing ssh key for submodules") - } + const submodules = fs.readFileSync(".gitmodules", "utf8") + const submoduleDirs = submodules.match(/path = (.*)/g)?.map((path) => path.replace("path = ", "")) + if (submoduleDirs) { + try { + for (const dir of submoduleDirs) { + const content = fs.readdirSync(dir) + if (!content.length) { + throw new Error("🚩 Missing ssh key for submodules") + } + } + } catch (error) { + console.error(error.message) + throw new Error("🚩 Please add an ssh key for submodules (see https://github.com/consensusnetworks/casimir#prerequisites #2)") + } } - } catch (error) { - console.error(error.message) - throw new Error("🚩 Please add an ssh key for submodules (see https://github.com/consensusnetworks/casimir#prerequisites #2)") - } - } - const go = await run("go version") as string - try { - const goSplit = go.split(" ") - const goNumber = goSplit[2] - const goNumberSplit = goNumber.split(".") - const goMajor = parseInt(goNumberSplit[0]) - const goMinor = parseInt(goNumberSplit[1]) - if (goMajor < 1 || goMinor < 20) { - throw new Error("🚩 Incompatible go version") - } - } catch (error) { - console.error(error.message) - throw new Error("🚩 Please install go v1.18.x (see https://github.com/consensusnetworks/casimir#prerequisites #3)") - } + const go = await run("go version") as string + try { + const goSplit = go.split(" ") + const goNumber = goSplit[2] + const goNumberSplit = goNumber.split(".") + const goMajor = parseInt(goNumberSplit[0]) + const goMinor = parseInt(goNumberSplit[1]) + if (goMajor < 1 || goMinor < 20) { + throw new Error("🚩 Incompatible go version") + } + } catch (error) { + console.error(error.message) + throw new Error("🚩 Please install go v1.18.x (see https://github.com/consensusnetworks/casimir#prerequisites #3)") + } - try { - const node = await run("node --version") as string - if (!node.includes("v18")) { - throw new Error("🚩 Incompatible node version") - } - } catch (error) { - console.error(error.message) - throw new Error("🚩 Please install node v18.x (see https://github.com/consensusnetworks/casimir#prerequisites #4)") + try { + const node = await run("node --version") as string + if (!node.includes("v18")) { + throw new Error("🚩 Incompatible node version") + } + } catch (error) { + console.error(error.message) + throw new Error("🚩 Please install node v18.x (see https://github.com/consensusnetworks/casimir#prerequisites #4)") + } } - } }() \ No newline at end of file diff --git a/scripts/root/clean.ts b/scripts/root/clean.ts index f9ce2d30f..227e6cf1d 100644 --- a/scripts/root/clean.ts +++ b/scripts/root/clean.ts @@ -12,32 +12,32 @@ const rm = promisify(fs.rm) */ void async function () { - const { workspaces } = JSON.parse(await readFile("package.json", "utf8")) - const packageDirs: string[] = [] - for (const workspace of workspaces) { - const baseDir = workspace.replace("/*", "") - const packages = await readdir(baseDir) - for (const pkg of packages) { - const isNpm = await exists(`${baseDir}/${pkg}/package.json`) - if (isNpm) { - packageDirs.push(`${baseDir}/${pkg}/build`) - packageDirs.push(`${baseDir}/${pkg}/dist`) - packageDirs.push(`${baseDir}/${pkg}/node_modules`) - packageDirs.push(`${baseDir}/${pkg}/scripts/.out`) - } + const { workspaces } = JSON.parse(await readFile("package.json", "utf8")) + const packageDirs: string[] = [] + for (const workspace of workspaces) { + const baseDir = workspace.replace("/*", "") + const packages = await readdir(baseDir) + for (const pkg of packages) { + const isNpm = await exists(`${baseDir}/${pkg}/package.json`) + if (isNpm) { + packageDirs.push(`${baseDir}/${pkg}/build`) + packageDirs.push(`${baseDir}/${pkg}/dist`) + packageDirs.push(`${baseDir}/${pkg}/node_modules`) + packageDirs.push(`${baseDir}/${pkg}/scripts/.out`) + } + } } - } - const submodules = await readFile(".gitmodules", "utf8") - const submoduleDirs = submodules.match(/path = (.*)/g)?.map((path) => path.replace("path = ", "")) || [] + const submodules = await readFile(".gitmodules", "utf8") + const submoduleDirs = submodules.match(/path = (.*)/g)?.map((path) => path.replace("path = ", "")) || [] - const items = ["node_modules", "package-lock.json"].concat(packageDirs, submoduleDirs) - for (const item of items) { - if (await exists(item)) { - console.log("Removing", item) - await rm(item, { recursive: true }) + const items = ["node_modules", "package-lock.json"].concat(packageDirs, submoduleDirs) + for (const item of items) { + if (await exists(item)) { + console.log("Removing", item) + await rm(item, { recursive: true }) + } } - } - console.log("Reinstalling dependencies") - await run("npm i") + console.log("Reinstalling dependencies") + await run("npm i") }() \ No newline at end of file diff --git a/scripts/root/dev.ts b/scripts/root/dev.ts index 7269906b9..2c56462dd 100644 --- a/scripts/root/dev.ts +++ b/scripts/root/dev.ts @@ -23,128 +23,128 @@ import { run, runSync } from "@casimir/shell" * - ETHEREUM_FORK_BLOCK: string */ async function root() { - const apps = { - landing: { - contracts: false, - port: 3002, - services: { - blog: { - port: 4001, + const apps = { + landing: { + contracts: false, + port: 3002, + services: { + blog: { + port: 4001, + } + } + }, + web: { + contracts: true, + port: 3001, + services: { + users: { + port: 4000, + } + } } - } - }, - web: { - contracts: true, - port: 3001, - services: { - users: { - port: 4000, - } - } } - } - const app = process.env.APP || "web" - if (!apps[app]) { - throw new Error(`App ${app} is not supported`) - } - const services = apps[app].services || {} + const app = process.env.APP || "web" + if (!apps[app]) { + throw new Error(`App ${app} is not supported`) + } + const services = apps[app].services || {} - if (process.env.USE_SECRETS !== "false") { - await loadCredentials() - process.env.BIP39_SEED = process.env.BIP39_SEED || await getSecret("consensus-networks-bip39-seed") || "" - process.env.CRYPTO_COMPARE_API_KEY = process.env.CRYPTO_COMPARE_API_KEY || await getSecret("casimir-crypto-compare-api-key") || "" - process.env.HACKMD_TOKEN = process.env.HACKMD_TOKEN || await getSecret("casimir-blog-hackmd-token") || "" - process.env.WALLET_CONNECT_PROJECT_ID = process.env.WALLET_CONNECT_PROJECT_ID || await getSecret("casimir-wallet-connect-project-id") || "" - } else { - process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" - process.env.CRYPTO_COMPARE_API_KEY = process.env.CRYPTO_COMPARE_API_KEY || "" - process.env.HACKMD_TOKEN = process.env.HACKMD_TOKEN || "" - process.env.WALLET_CONNECT_PROJECT_ID = process.env.WALLET_CONNECT_PROJECT_ID || "8e6877b49198d7a9f9561b8712805726" - } + if (process.env.USE_SECRETS !== "false") { + await loadCredentials() + process.env.BIP39_SEED = process.env.BIP39_SEED || await getSecret("consensus-networks-bip39-seed") || "" + process.env.CRYPTO_COMPARE_API_KEY = process.env.CRYPTO_COMPARE_API_KEY || await getSecret("casimir-crypto-compare-api-key") || "" + process.env.HACKMD_TOKEN = process.env.HACKMD_TOKEN || await getSecret("casimir-blog-hackmd-token") || "" + process.env.WALLET_CONNECT_PROJECT_ID = process.env.WALLET_CONNECT_PROJECT_ID || await getSecret("casimir-wallet-connect-project-id") || "" + } else { + process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" + process.env.CRYPTO_COMPARE_API_KEY = process.env.CRYPTO_COMPARE_API_KEY || "" + process.env.HACKMD_TOKEN = process.env.HACKMD_TOKEN || "" + process.env.WALLET_CONNECT_PROJECT_ID = process.env.WALLET_CONNECT_PROJECT_ID || "8e6877b49198d7a9f9561b8712805726" + } - console.log(process.env.BIP39_SEED) + console.log(process.env.BIP39_SEED) - process.env.PROJECT = process.env.PROJECT || "casimir" - process.env.STAGE = process.env.STAGE || "local" - process.env.FORK = process.env.FORK || "testnet" - process.env.MOCK_SERVICES = process.env.MOCK_SERVICES || "true" - process.env.BUILD_PREVIEW = process.env.BUILD_PREVIEW || "false" + process.env.PROJECT = process.env.PROJECT || "casimir" + process.env.STAGE = process.env.STAGE || "local" + process.env.FORK = process.env.FORK || "testnet" + process.env.MOCK_SERVICES = process.env.MOCK_SERVICES || "true" + process.env.BUILD_PREVIEW = process.env.BUILD_PREVIEW || "false" - if (process.env.BUILD_PREVIEW === "true") { - process.env[`${app.toUpperCase()}_URL`] = `http://localhost:${apps[app].port}` - } else { - process.env[`${app.toUpperCase()}_URL`] = `http://localhost:${apps[app].port}` - } + if (process.env.BUILD_PREVIEW === "true") { + process.env[`${app.toUpperCase()}_URL`] = `http://localhost:${apps[app].port}` + } else { + process.env[`${app.toUpperCase()}_URL`] = `http://localhost:${apps[app].port}` + } - if (process.env.MOCK_SERVICES === "true") { - for (const service of Object.keys(services)) { - const existingProcess = await run(`lsof -i :${services[service].port} | grep LISTEN | awk '{print $2}'`) - if (existingProcess) { - throw new Error(`Port ${services[service].port} is already in use by process ${existingProcess}, but is required by ${service}.`) - } + if (process.env.MOCK_SERVICES === "true") { + for (const service of Object.keys(services)) { + const existingProcess = await run(`lsof -i :${services[service].port} | grep LISTEN | awk '{print $2}'`) + if (existingProcess) { + throw new Error(`Port ${services[service].port} is already in use by process ${existingProcess}, but is required by ${service}.`) + } - process.env[`${service.toUpperCase()}_URL`] = `http://localhost:${services[service].port}` - run(`npm run dev --workspace @casimir/${service}`) + process.env[`${service.toUpperCase()}_URL`] = `http://localhost:${services[service].port}` + run(`npm run dev --workspace @casimir/${service}`) + } } - } - const networkKey = process.env.NETWORK?.toUpperCase() || process.env.FORK?.toUpperCase() || "TESTNET" - process.env.FACTORY_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.FACTORY_ADDRESS - process.env.SSV_NETWORK_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_NETWORK_ADDRESS - process.env.SSV_VIEWS_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_VIEWS_ADDRESS - if (apps[app].contracts) { - if (process.env.NETWORK) { - const networkName = ETHEREUM_NETWORK_NAME[networkKey] - process.env.ETHEREUM_RPC_URL = ETHEREUM_RPC_URL[networkKey] - console.log(`Connecting to ${networkName} network at ${process.env.ETHEREUM_RPC_URL}`) - } else { - const networkName = ETHEREUM_NETWORK_NAME[networkKey] - process.env.ETHEREUM_FORK_RPC_URL = ETHEREUM_RPC_URL[networkKey] - process.env.ETHEREUM_RPC_URL = "http://127.0.0.1:8545" - console.log(`Connecting to ${networkName} network fork at ${process.env.ETHEREUM_RPC_URL}`) + const networkKey = process.env.NETWORK?.toUpperCase() || process.env.FORK?.toUpperCase() || "TESTNET" + process.env.FACTORY_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.FACTORY_ADDRESS + process.env.SSV_NETWORK_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_NETWORK_ADDRESS + process.env.SSV_VIEWS_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_VIEWS_ADDRESS + if (apps[app].contracts) { + if (process.env.NETWORK) { + const networkName = ETHEREUM_NETWORK_NAME[networkKey] + process.env.ETHEREUM_RPC_URL = ETHEREUM_RPC_URL[networkKey] + console.log(`Connecting to ${networkName} network at ${process.env.ETHEREUM_RPC_URL}`) + } else { + const networkName = ETHEREUM_NETWORK_NAME[networkKey] + process.env.ETHEREUM_FORK_RPC_URL = ETHEREUM_RPC_URL[networkKey] + process.env.ETHEREUM_RPC_URL = "http://127.0.0.1:8545" + console.log(`Connecting to ${networkName} network fork at ${process.env.ETHEREUM_RPC_URL}`) - const forkProvider = new ethers.providers.JsonRpcProvider(process.env.ETHEREUM_FORK_RPC_URL) - process.env.ETHEREUM_FORK_BLOCK = process.env.ETHEREUM_FORK_BLOCK || `${await forkProvider.getBlockNumber() - 10}` - console.log(`📍 Forking started at ${process.env.ETHEREUM_FORK_BLOCK}`) + const forkProvider = new ethers.providers.JsonRpcProvider(process.env.ETHEREUM_FORK_RPC_URL) + process.env.ETHEREUM_FORK_BLOCK = process.env.ETHEREUM_FORK_BLOCK || `${await forkProvider.getBlockNumber() - 10}` + console.log(`📍 Forking started at ${process.env.ETHEREUM_FORK_BLOCK}`) - process.env.TUNNEL = process.env.TUNNEL || "false" - process.env.MINING_INTERVAL = "12" - process.env.SIMULATE_EIGEN = "true" - process.env.SIMULATE_REWARDS = "true" + process.env.TUNNEL = process.env.TUNNEL || "false" + process.env.MINING_INTERVAL = "12" + process.env.SIMULATE_EIGEN = "true" + process.env.SIMULATE_REWARDS = "true" - run("npm run dev --workspace @casimir/ethereum -- --network localhost") + run("npm run dev --workspace @casimir/ethereum -- --network localhost") + } } - } - process.env.PUBLIC_STAGE = process.env.STAGE - process.env.PUBLIC_BLOG_URL = process.env.BLOG_URL - process.env.PUBLIC_USERS_URL = process.env.USERS_URL - process.env.PUBLIC_ETHEREUM_RPC_URL = process.env.ETHEREUM_RPC_URL - process.env.PUBLIC_FACTORY_ADDRESS = process.env.FACTORY_ADDRESS - process.env.PUBLIC_SSV_NETWORK_ADDRESS = process.env.SSV_NETWORK_ADDRESS - process.env.PUBLIC_SSV_VIEWS_ADDRESS = process.env.SSV_VIEWS_ADDRESS - process.env.PUBLIC_CRYPTO_COMPARE_API_KEY = process.env.CRYPTO_COMPARE_API_KEY - process.env.PUBLIC_ETHEREUM_FORK_BLOCK = process.env.ETHEREUM_FORK_BLOCK - process.env.PUBLIC_WALLET_CONNECT_PROJECT_ID = process.env.WALLET_CONNECT_PROJECT_ID + process.env.PUBLIC_STAGE = process.env.STAGE + process.env.PUBLIC_BLOG_URL = process.env.BLOG_URL + process.env.PUBLIC_USERS_URL = process.env.USERS_URL + process.env.PUBLIC_ETHEREUM_RPC_URL = process.env.ETHEREUM_RPC_URL + process.env.PUBLIC_FACTORY_ADDRESS = process.env.FACTORY_ADDRESS + process.env.PUBLIC_SSV_NETWORK_ADDRESS = process.env.SSV_NETWORK_ADDRESS + process.env.PUBLIC_SSV_VIEWS_ADDRESS = process.env.SSV_VIEWS_ADDRESS + process.env.PUBLIC_CRYPTO_COMPARE_API_KEY = process.env.CRYPTO_COMPARE_API_KEY + process.env.PUBLIC_ETHEREUM_FORK_BLOCK = process.env.ETHEREUM_FORK_BLOCK + process.env.PUBLIC_WALLET_CONNECT_PROJECT_ID = process.env.WALLET_CONNECT_PROJECT_ID - if (process.env.BUILD_PREVIEW === "true") { - await run(`npm run build --workspace @casimir/${app}`) - run(`npm run preview --workspace @casimir/${app}`) - } else { - run(`npm run dev --workspace @casimir/${app}`) - } + if (process.env.BUILD_PREVIEW === "true") { + await run(`npm run build --workspace @casimir/${app}`) + run(`npm run preview --workspace @casimir/${app}`) + } else { + run(`npm run dev --workspace @casimir/${app}`) + } - if (process.env.MOCK_SERVICES === "true" && app === "web") { - process.on("SIGINT", () => { - console.log("🧹 Cleaning up users service") - runSync("npm run clean --workspace @casimir/users") - process.exit() - }) - } + if (process.env.MOCK_SERVICES === "true" && app === "web") { + process.on("SIGINT", () => { + console.log("🧹 Cleaning up users service") + runSync("npm run clean --workspace @casimir/users") + process.exit() + }) + } } root().catch(error => { - console.error(error) - process.exit(1) + console.error(error) + process.exit(1) }) diff --git a/services/blog/src/index.ts b/services/blog/src/index.ts index a9e28f492..c1d790cf8 100644 --- a/services/blog/src/index.ts +++ b/services/blog/src/index.ts @@ -9,45 +9,45 @@ app.use(express.json()) const hackmdUrl = "https://api.hackmd.io/v1/teams" app.get("/articles", async (_req, res) => { - const options = { - method: "GET", - headers: { - Authorization: `Bearer ${process.env.HACKMD_TOKEN}`, - "Content-Type": "application/json", + const options = { + method: "GET", + headers: { + Authorization: `Bearer ${process.env.HACKMD_TOKEN}`, + "Content-Type": "application/json", + } + } + const response = await fetch(`${hackmdUrl}/consensusnetworks/notes`, options) + if (!response.ok) { + res.status(response.status).send("Error fetching articles") + } else { + const data = await response.json() as HackmdArticle[] + const hackmdArticles = data.filter((item) => item.tags.includes("blog") && item.publishedAt) + res.json(hackmdArticles) } - } - const response = await fetch(`${hackmdUrl}/consensusnetworks/notes`, options) - if (!response.ok) { - res.status(response.status).send("Error fetching articles") - } else { - const data = await response.json() as HackmdArticle[] - const hackmdArticles = data.filter((item) => item.tags.includes("blog") && item.publishedAt) - res.json(hackmdArticles) - } }) app.get("/articles/:id", async (req, res) => { - const notesId = req.params.id - const options = { - method: "GET", - headers: { - Authorization: `Bearer ${process.env.HACKMD_TOKEN}`, - "Content-Type": "application/json", - }, - } - const response = await fetch(`${hackmdUrl}/consensusnetworks/notes/${notesId}`, options) - if (!response.ok) { - res.status(response.status).send(`Error fetching article ${notesId}`) - } else { - const hackmdArticle = await response.json() as HackmdArticle - res.json(hackmdArticle) - } + const notesId = req.params.id + const options = { + method: "GET", + headers: { + Authorization: `Bearer ${process.env.HACKMD_TOKEN}`, + "Content-Type": "application/json", + }, + } + const response = await fetch(`${hackmdUrl}/consensusnetworks/notes/${notesId}`, options) + if (!response.ok) { + res.status(response.status).send(`Error fetching article ${notesId}`) + } else { + const hackmdArticle = await response.json() as HackmdArticle + res.json(hackmdArticle) + } }) app.get("/health", (_req, res) => { - res.status(200).send("OK") + res.status(200).send("OK") }) app.listen(4001, () => { - console.log("Blog server listening on port 4001") + console.log("Blog server listening on port 4001") }) diff --git a/services/functions/scripts/dev.ts b/services/functions/scripts/dev.ts index 96c5110c0..253dfe7c6 100644 --- a/services/functions/scripts/dev.ts +++ b/services/functions/scripts/dev.ts @@ -8,27 +8,27 @@ import { waitForNetwork } from "@casimir/ethereum/helpers/network" * Start the Chainlink functions service */ async function dev() { - if (process.env.USE_SECRETS !== "false") { - await loadCredentials() - process.env.BIP39_SEED = process.env.BIP39_SEED || await getSecret("consensus-networks-bip39-seed") as string - } else { - process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" - } - const networkKey = process.env.NETWORK?.toUpperCase() || process.env.FORK?.toUpperCase() || "TESTNET" - process.env.ETHEREUM_RPC_URL = process.env.ETHEREUM_RPC_URL || ETHEREUM_RPC_URL[networkKey] - process.env.ETHEREUM_BEACON_RPC_URL = process.env.ETHEREUM_BEACON_RPC_URL || "http://127.0.0.1:5052" - process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.FUNCTIONS_BILLING_REGISTRY_ADDRESS - process.env.FUNCTIONS_ORACLE_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.FUNCTIONS_ORACLE_ADDRESS - process.env.USE_LOGS = process.env.USE_LOGS || "false" + if (process.env.USE_SECRETS !== "false") { + await loadCredentials() + process.env.BIP39_SEED = process.env.BIP39_SEED || await getSecret("consensus-networks-bip39-seed") as string + } else { + process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" + } + const networkKey = process.env.NETWORK?.toUpperCase() || process.env.FORK?.toUpperCase() || "TESTNET" + process.env.ETHEREUM_RPC_URL = process.env.ETHEREUM_RPC_URL || ETHEREUM_RPC_URL[networkKey] + process.env.ETHEREUM_BEACON_RPC_URL = process.env.ETHEREUM_BEACON_RPC_URL || "http://127.0.0.1:5052" + process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.FUNCTIONS_BILLING_REGISTRY_ADDRESS + process.env.FUNCTIONS_ORACLE_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.FUNCTIONS_ORACLE_ADDRESS + process.env.USE_LOGS = process.env.USE_LOGS || "false" - const provider = new ethers.providers.JsonRpcProvider(process.env.ETHEREUM_RPC_URL) - await waitForNetwork(provider) + const provider = new ethers.providers.JsonRpcProvider(process.env.ETHEREUM_RPC_URL) + await waitForNetwork(provider) - run("npx esno -r dotenv/config src/index.ts") - console.log("🔗 Functions service started") + run("npx esno -r dotenv/config src/index.ts") + console.log("🔗 Functions service started") } dev().catch(error => { - console.error(error) - process.exit(1) + console.error(error) + process.exit(1) }) \ No newline at end of file diff --git a/services/functions/scripts/simulate.ts b/services/functions/scripts/simulate.ts index ef8406f13..595b29f51 100644 --- a/services/functions/scripts/simulate.ts +++ b/services/functions/scripts/simulate.ts @@ -5,33 +5,33 @@ import { getSecret, loadCredentials } from "@casimir/aws" import { waitForNetwork } from "@casimir/ethereum/helpers/network" async function simulate() { - if (process.env.USE_SECRETS !== "false") { - await loadCredentials() - process.env.BIP39_SEED = process.env.BIP39_SEED || await getSecret("consensus-networks-bip39-seed") as string - } else { - process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" - } - const networkKey = process.env.FORK?.toUpperCase() || "TESTNET" - const networkName = ETHEREUM_NETWORK_NAME[networkKey] - process.env.ETHEREUM_FORK_RPC_URL = ETHEREUM_RPC_URL[networkKey] - process.env.ETHEREUM_RPC_URL = "http://127.0.0.1:8545" - console.log(`Connecting to ${networkName} network fork at ${process.env.ETHEREUM_RPC_URL}`) + if (process.env.USE_SECRETS !== "false") { + await loadCredentials() + process.env.BIP39_SEED = process.env.BIP39_SEED || await getSecret("consensus-networks-bip39-seed") as string + } else { + process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" + } + const networkKey = process.env.FORK?.toUpperCase() || "TESTNET" + const networkName = ETHEREUM_NETWORK_NAME[networkKey] + process.env.ETHEREUM_FORK_RPC_URL = ETHEREUM_RPC_URL[networkKey] + process.env.ETHEREUM_RPC_URL = "http://127.0.0.1:8545" + console.log(`Connecting to ${networkName} network fork at ${process.env.ETHEREUM_RPC_URL}`) - const forkProvider = new ethers.providers.JsonRpcProvider(process.env.ETHEREUM_FORK_RPC_URL) - process.env.ETHEREUM_FORK_BLOCK = process.env.ETHEREUM_FORK_BLOCK || `${await forkProvider.getBlockNumber() - 10}` - console.log(`📍 Forking started at ${process.env.ETHEREUM_FORK_BLOCK}`) + const forkProvider = new ethers.providers.JsonRpcProvider(process.env.ETHEREUM_FORK_RPC_URL) + process.env.ETHEREUM_FORK_BLOCK = process.env.ETHEREUM_FORK_BLOCK || `${await forkProvider.getBlockNumber() - 10}` + console.log(`📍 Forking started at ${process.env.ETHEREUM_FORK_BLOCK}`) - process.env.TUNNEL = process.env.TUNNEL || "false" - process.env.MINING_INTERVAL = "12" - process.env.SIMULATE_UPGRADES = "true" - process.env.SIMULATE_UPKEEP = "true" + process.env.TUNNEL = process.env.TUNNEL || "false" + process.env.MINING_INTERVAL = "12" + process.env.SIMULATE_UPGRADES = "true" + process.env.SIMULATE_UPKEEP = "true" - run("npm run dev --workspace @casimir/ethereum -- --network localhost") - run("npm run report --workspace @casimir/ethereum -- --network localhost") - run("npm run dev --workspace @casimir/functions") + run("npm run dev --workspace @casimir/ethereum -- --network localhost") + run("npm run report --workspace @casimir/ethereum -- --network localhost") + run("npm run dev --workspace @casimir/functions") } simulate().catch(error => { - console.error(error) - process.exit(1) + console.error(error) + process.exit(1) }) \ No newline at end of file diff --git a/services/functions/src/index.ts b/services/functions/src/index.ts index e5fb949ae..eae0f964c 100644 --- a/services/functions/src/index.ts +++ b/services/functions/src/index.ts @@ -9,60 +9,60 @@ import FunctionsOracleAbi from "@casimir/ethereum/build/abi/FunctionsOracle.json const config = getConfig() async function run() { - const contracts = { - FunctionsOracle: { - abi: FunctionsOracleAbi, - addresses: [config.functionsOracleAddress], - events: { - OracleRequest: fulfillRequestHandler - } + const contracts = { + FunctionsOracle: { + abi: FunctionsOracleAbi, + addresses: [config.functionsOracleAddress], + events: { + OracleRequest: fulfillRequestHandler + } + } } - } - const contractFilters = Object.values(contracts).map((contract) => { - return { - abi: contract.abi, - addresses: contract.addresses, - events: Object.keys(contract.events) - } - }) + const contractFilters = Object.values(contracts).map((contract) => { + return { + abi: contract.abi, + addresses: contract.addresses, + events: Object.keys(contract.events) + } + }) - let startBlock - if (process.env.USE_LOGS === "true") { - startBlock = getStartBlock("block.log") - } + let startBlock + if (process.env.USE_LOGS === "true") { + startBlock = getStartBlock("block.log") + } - const eventsIterable = getEventsIterable({ - contractFilters, - ethereumUrl: config.ethereumUrl, - startBlock - }) + const eventsIterable = getEventsIterable({ + contractFilters, + ethereumUrl: config.ethereumUrl, + startBlock + }) - const handlers: Record Promise> = {} - for (const contract of Object.values(contracts)) { - for (const [event, handler] of Object.entries(contract.events)) { - handlers[event as keyof typeof handlers] = handler + const handlers: Record Promise> = {} + for (const contract of Object.values(contracts)) { + for (const [event, handler] of Object.entries(contract.events)) { + handlers[event as keyof typeof handlers] = handler + } } - } - for await (const event of eventsIterable) { - console.log(`Received ${event.event} event from ${event.address}`) - const args = event.args as ethers.utils.Result - const handler = handlers[event.event as string] - if (!handler) throw new Error(`No handler found for event ${event.event}`) - await handler({ args }) - if (process.env.USE_LOGS === "true") { - // Todo check if this possibly misses events - updateStartBlock("block.log", event.blockNumber + 1) + for await (const event of eventsIterable) { + console.log(`Received ${event.event} event from ${event.address}`) + const args = event.args as ethers.utils.Result + const handler = handlers[event.event as string] + if (!handler) throw new Error(`No handler found for event ${event.event}`) + await handler({ args }) + if (process.env.USE_LOGS === "true") { + // Todo check if this possibly misses events + updateStartBlock("block.log", event.blockNumber + 1) + } } - } } run().catch(error => { - if (process.env.USE_LOGS === "true") { - updateErrorLog("error.log", (error as Error).message) - } else { - console.log(error) - } - process.exit(1) + if (process.env.USE_LOGS === "true") { + updateErrorLog("error.log", (error as Error).message) + } else { + console.log(error) + } + process.exit(1) }) \ No newline at end of file diff --git a/services/functions/src/providers/config.ts b/services/functions/src/providers/config.ts index a43e08383..5a32ef8cd 100644 --- a/services/functions/src/providers/config.ts +++ b/services/functions/src/providers/config.ts @@ -1,24 +1,24 @@ import { ethers } from "ethers" export function getConfig() { - const ethereumUrl = process.env.ETHEREUM_RPC_URL - if (!ethereumUrl) throw new Error("No ethereum rpc url provided") + const ethereumUrl = process.env.ETHEREUM_RPC_URL + if (!ethereumUrl) throw new Error("No ethereum rpc url provided") - const mnemonic = process.env.BIP39_SEED - if (!mnemonic) throw new Error("No mnemonic provided") - const accountPath = "m/44'/60'/0'/0/2" - const wallet = ethers.Wallet.fromMnemonic(mnemonic, accountPath) + const mnemonic = process.env.BIP39_SEED + if (!mnemonic) throw new Error("No mnemonic provided") + const accountPath = "m/44'/60'/0'/0/2" + const wallet = ethers.Wallet.fromMnemonic(mnemonic, accountPath) - const functionsBillingRegistryAddress = process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS - if (!functionsBillingRegistryAddress) throw new Error("No functions billing registry address provided") + const functionsBillingRegistryAddress = process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS + if (!functionsBillingRegistryAddress) throw new Error("No functions billing registry address provided") - const functionsOracleAddress = process.env.FUNCTIONS_ORACLE_ADDRESS - if (!functionsOracleAddress) throw new Error("No functions oracle address provided") + const functionsOracleAddress = process.env.FUNCTIONS_ORACLE_ADDRESS + if (!functionsOracleAddress) throw new Error("No functions oracle address provided") - return { - ethereumUrl, - functionsBillingRegistryAddress, - functionsOracleAddress, - wallet - } + return { + ethereumUrl, + functionsBillingRegistryAddress, + functionsOracleAddress, + wallet + } } \ No newline at end of file diff --git a/services/functions/src/providers/format.ts b/services/functions/src/providers/format.ts index 5e32b51e3..81add33bf 100644 --- a/services/functions/src/providers/format.ts +++ b/services/functions/src/providers/format.ts @@ -6,8 +6,8 @@ import cbor from "cbor" * @param hex The hex string to decode */ export function decodeDietCBOR(hex: string) { - const buf = hexToBuf(hex) - return cbor.decodeFirstSync(addCBORMapDelimiters(buf)) + const buf = hexToBuf(hex) + return cbor.decodeFirstSync(addCBORMapDelimiters(buf)) } /** @@ -15,7 +15,7 @@ export function decodeDietCBOR(hex: string) { * @param hex The hex string to convert to a buffer */ export function hexToBuf(hex: string): Buffer { - return Buffer.from(stripHexPrefix(hex), "hex") + return Buffer.from(stripHexPrefix(hex), "hex") } /** @@ -23,34 +23,34 @@ export function hexToBuf(hex: string): Buffer { * @param hex The hex string to strip the leading hex prefix out of */ export function stripHexPrefix(hex: string): string { - if (!ethers.utils.isHexString(hex)) { - throw Error(`Expected valid hex string, got: "${hex}"`) - } - return hex.replace("0x", "") + if (!ethers.utils.isHexString(hex)) { + throw Error(`Expected valid hex string, got: "${hex}"`) + } + return hex.replace("0x", "") } /** * Add a starting and closing map characters to a CBOR encoding if they are not already present. */ export function addCBORMapDelimiters(buffer: Buffer): Buffer { - if (buffer[0] >> 5 === 5) { - return buffer - } + if (buffer[0] >> 5 === 5) { + return buffer + } - /** + /** * This is the opening character of a CBOR map. * @see https://en.wikipedia.org/wiki/CBOR#CBOR_data_item_header */ - const startIndefiniteLengthMap = Buffer.from([0xbf]) - /** + const startIndefiniteLengthMap = Buffer.from([0xbf]) + /** * This is the closing character in a CBOR map. * @see https://en.wikipedia.org/wiki/CBOR#CBOR_data_item_header */ - const endIndefiniteLengthMap = Buffer.from([0xff]) - return Buffer.concat( - [startIndefiniteLengthMap, - buffer, - endIndefiniteLengthMap], - buffer.length + 2, - ) + const endIndefiniteLengthMap = Buffer.from([0xff]) + return Buffer.concat( + [startIndefiniteLengthMap, + buffer, + endIndefiniteLengthMap], + buffer.length + 2, + ) } \ No newline at end of file diff --git a/services/functions/src/providers/handlers.ts b/services/functions/src/providers/handlers.ts index 268c07085..6a81e497b 100644 --- a/services/functions/src/providers/handlers.ts +++ b/services/functions/src/providers/handlers.ts @@ -11,43 +11,43 @@ import FunctionsBillingRegistryAbi from "@casimir/ethereum/build/abi/FunctionsBi const config = getConfig() export async function fulfillRequestHandler(input: HandlerInput): Promise { - const { requestId, data } = input.args as ethers.utils.Result - if (!requestId) throw new Error("No request id provided") - if (!data) throw new Error("No data provided") + const { requestId, data } = input.args as ethers.utils.Result + if (!requestId) throw new Error("No request id provided") + if (!data) throw new Error("No data provided") - const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) - const functionsBillingRegistry = new ethers.Contract( - config.functionsBillingRegistryAddress, FunctionsBillingRegistryAbi, provider - ) as FunctionsBillingRegistry + const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) + const functionsBillingRegistry = new ethers.Contract( + config.functionsBillingRegistryAddress, FunctionsBillingRegistryAbi, provider + ) as FunctionsBillingRegistry - const { args } = decodeDietCBOR(data) - const currentRequestConfig = { - ...requestConfig, - args - } + const { args } = decodeDietCBOR(data) + const currentRequestConfig = { + ...requestConfig, + args + } - const { result, resultLog, success } = await simulateRequest(currentRequestConfig) - if (success) { - const signer = config.wallet.connect(provider) - const dummySigners = Array(31).fill(signer.address) - const fulfillAndBill = await functionsBillingRegistry.connect(signer).fulfillAndBill( - requestId, - result, - "0x", - signer.address, - dummySigners, - 4, - 100_000, - 500_000, - { - gasLimit: 500_000, - } - ) - await fulfillAndBill.wait() - if (process.env.USE_LOGS === "true") { - updateExecutionLog("execution.log", resultLog) + const { result, resultLog, success } = await simulateRequest(currentRequestConfig) + if (success) { + const signer = config.wallet.connect(provider) + const dummySigners = Array(31).fill(signer.address) + const fulfillAndBill = await functionsBillingRegistry.connect(signer).fulfillAndBill( + requestId, + result, + "0x", + signer.address, + dummySigners, + 4, + 100_000, + 500_000, + { + gasLimit: 500_000, + } + ) + await fulfillAndBill.wait() + if (process.env.USE_LOGS === "true") { + updateExecutionLog("execution.log", resultLog) + } + } else { + throw new Error(resultLog) } - } else { - throw new Error(resultLog) - } } \ No newline at end of file diff --git a/services/oracle/scripts/dev.ts b/services/oracle/scripts/dev.ts index d27270e36..869477cda 100644 --- a/services/oracle/scripts/dev.ts +++ b/services/oracle/scripts/dev.ts @@ -6,44 +6,44 @@ import { run } from "@casimir/shell" * Start development DAO oracle service */ void async function () { - process.env.CLI_PATH = process.env.CLI_PATH || "./lib/dkg/bin/ssv-dkg" - process.env.CONFIG_PATH = process.env.CONFIG_PATH || "./config/example.dkg.initiator.yaml" + process.env.CLI_PATH = process.env.CLI_PATH || "./lib/dkg/bin/ssv-dkg" + process.env.CONFIG_PATH = process.env.CONFIG_PATH || "./config/example.dkg.initiator.yaml" - if (process.env.USE_SECRETS !== "false") { - await loadCredentials() - process.env.BIP39_SEED = process.env.BIP39_SEED || await getSecret("consensus-networks-bip39-seed") as string - } else { - process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" - } + if (process.env.USE_SECRETS !== "false") { + await loadCredentials() + process.env.BIP39_SEED = process.env.BIP39_SEED || await getSecret("consensus-networks-bip39-seed") as string + } else { + process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" + } - const networkKey = process.env.NETWORK?.toUpperCase() || process.env.FORK?.toUpperCase() || "TESTNET" + const networkKey = process.env.NETWORK?.toUpperCase() || process.env.FORK?.toUpperCase() || "TESTNET" - process.env.ETHEREUM_RPC_URL = process.env.ETHEREUM_RPC_URL || ETHEREUM_RPC_URL[networkKey] - process.env.FACTORY_ADDRESS = process.env.FACTORY_ADDRESS || ETHEREUM_CONTRACTS[networkKey]?.FACTORY_ADDRESS - process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS = process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS + process.env.ETHEREUM_RPC_URL = process.env.ETHEREUM_RPC_URL || ETHEREUM_RPC_URL[networkKey] + process.env.FACTORY_ADDRESS = process.env.FACTORY_ADDRESS || ETHEREUM_CONTRACTS[networkKey]?.FACTORY_ADDRESS + process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS = process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS || ETHEREUM_CONTRACTS[networkKey]?.FUNCTIONS_BILLING_REGISTRY_ADDRESS - process.env.KEEPER_REGISTRY_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.KEEPER_REGISTRY_ADDRESS - process.env.LINK_TOKEN_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.LINK_TOKEN_ADDRESS - process.env.SSV_NETWORK_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_NETWORK_ADDRESS - process.env.SSV_VIEWS_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_VIEWS_ADDRESS - process.env.SSV_TOKEN_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_TOKEN_ADDRESS - process.env.SWAP_FACTORY_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SWAP_FACTORY_ADDRESS - process.env.WETH_TOKEN_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.WETH_TOKEN_ADDRESS + process.env.KEEPER_REGISTRY_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.KEEPER_REGISTRY_ADDRESS + process.env.LINK_TOKEN_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.LINK_TOKEN_ADDRESS + process.env.SSV_NETWORK_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_NETWORK_ADDRESS + process.env.SSV_VIEWS_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_VIEWS_ADDRESS + process.env.SSV_TOKEN_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_TOKEN_ADDRESS + process.env.SWAP_FACTORY_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SWAP_FACTORY_ADDRESS + process.env.WETH_TOKEN_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.WETH_TOKEN_ADDRESS - if (!process.env.ETHEREUM_RPC_URL) throw new Error(`No ethereum rpc url provided for ${networkKey}`) - if (!process.env.FACTORY_ADDRESS) throw new Error(`No factory address provided for ${networkKey}`) - if (!process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS) throw new Error(`No functions billing registry address provided for ${networkKey}`) - if (!process.env.KEEPER_REGISTRY_ADDRESS) throw new Error(`No keeper registry address provided for ${networkKey}`) - if (!process.env.LINK_TOKEN_ADDRESS) throw new Error(`No link token address provided for ${networkKey}`) - if (!process.env.SSV_NETWORK_ADDRESS) throw new Error(`No ssv network address provided for ${networkKey}`) - if (!process.env.SSV_VIEWS_ADDRESS) throw new Error(`No ssv views address provided for ${networkKey}`) - if (!process.env.SSV_TOKEN_ADDRESS) throw new Error(`No ssv token address provided for ${networkKey}`) - if (!process.env.SWAP_FACTORY_ADDRESS) throw new Error(`No uniswap v3 factory address provided for ${networkKey}`) + if (!process.env.ETHEREUM_RPC_URL) throw new Error(`No ethereum rpc url provided for ${networkKey}`) + if (!process.env.FACTORY_ADDRESS) throw new Error(`No factory address provided for ${networkKey}`) + if (!process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS) throw new Error(`No functions billing registry address provided for ${networkKey}`) + if (!process.env.KEEPER_REGISTRY_ADDRESS) throw new Error(`No keeper registry address provided for ${networkKey}`) + if (!process.env.LINK_TOKEN_ADDRESS) throw new Error(`No link token address provided for ${networkKey}`) + if (!process.env.SSV_NETWORK_ADDRESS) throw new Error(`No ssv network address provided for ${networkKey}`) + if (!process.env.SSV_VIEWS_ADDRESS) throw new Error(`No ssv views address provided for ${networkKey}`) + if (!process.env.SSV_TOKEN_ADDRESS) throw new Error(`No ssv token address provided for ${networkKey}`) + if (!process.env.SWAP_FACTORY_ADDRESS) throw new Error(`No uniswap v3 factory address provided for ${networkKey}`) - await run("GOWORK=off make -C lib/dkg build") + await run("GOWORK=off make -C lib/dkg build") - process.env.USE_LOGS = process.env.USE_LOGS || "false" - run("npx esno -r dotenv/config src/index.ts") - console.log("🔮 Oracle service started") + process.env.USE_LOGS = process.env.USE_LOGS || "false" + run("npx esno -r dotenv/config src/index.ts") + console.log("🔮 Oracle service started") }() \ No newline at end of file diff --git a/services/oracle/scripts/generate.ts b/services/oracle/scripts/generate.ts index c8791fa98..364522772 100644 --- a/services/oracle/scripts/generate.ts +++ b/services/oracle/scripts/generate.ts @@ -9,89 +9,89 @@ import { Validator/*, Reshare*/ } from "@casimir/types" * Generate validator keys for ethereum testing */ void async function () { - const outputPath = "../../common/env/src/mock" + const outputPath = "../../common/env/src/mock" - process.env.CLI_PATH = process.env.CLI_PATH || "./lib/dkg/bin/ssv-dkg" - process.env.CONFIG_PATH = process.env.CONFIG_PATH || "./config/example.dkg.initiator.yaml" + process.env.CLI_PATH = process.env.CLI_PATH || "./lib/dkg/bin/ssv-dkg" + process.env.CONFIG_PATH = process.env.CONFIG_PATH || "./config/example.dkg.initiator.yaml" - process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" + process.env.BIP39_SEED = process.env.BIP39_SEED || "inflict ball claim confirm cereal cost note dad mix donate traffic patient" - if (!process.env.FACTORY_ADDRESS) throw new Error("No factory address provided") - - const preregisteredOperatorIds = process.env.PREREGISTERED_OPERATOR_IDS?.split(",").map(id => parseInt(id)) || [208, - 209, - 210, - 211/*, 212, 213, 214, 215*/] - if (preregisteredOperatorIds.length < 4) throw new Error("Not enough operator ids provided") - - const accountPath = "m/44'/60'/0'/0/1" - const wallet = ethers.Wallet.fromMnemonic(process.env.BIP39_SEED, accountPath) - - const validatorCount = 4 - const mockValidators = MOCK_VALIDATORS || {} - if (!mockValidators[wallet.address] || Object.keys(mockValidators[wallet.address]).length < validatorCount) { - await run("GOWORK=off make -C lib/dkg build") - - const managerAddress = ethers.utils.getContractAddress({ - from: process.env.FACTORY_ADDRESS, - nonce: 1 - }) - let managerNonce = 3 - let ownerNonce = 0 - - const newValidators: Validator[] = [] - // const newReshares: Reshare[] = [] - - for (let i = 0; i < validatorCount; i++) { - const poolId = i + 1 - console.log("🤖 Creating deposit for", poolId) - - const poolAddress = ethers.utils.getContractAddress({ - from: managerAddress, - nonce: managerNonce - }) - - const selectedOperatorIds = preregisteredOperatorIds.slice(0, 4) - - const dkg = new Dkg({ - cliPath: process.env.CLI_PATH, - configPath: process.env.CONFIG_PATH, - }) - - const validator = await dkg.init({ - poolId, - operatorIds: selectedOperatorIds, - ownerAddress: managerAddress, - ownerNonce, - withdrawalAddress: poolAddress - }) - - newValidators.push(validator) - - // for (let j = 0; j < 2; j++) { - // const oldOperatorIds = selectedOperatorIds.slice(1) - // const reshareOperatorIds = preregisteredOperatorIds.slice(0, 3).concat(preregisteredOperatorIds[4]) - - // const reshare = await dkg.reshare({ - // oldOperatorIds, - // operatorIds: reshareOperatorIds, - // ownerAddress: managerAddress, - // ownerNonce, - // poolId, - // publicKey: validator.publicKey, - // withdrawalAddress: poolAddress - // }) - // newReshares.push(reshare) - // } - // reshareStore[poolId] = newReshares - - managerNonce++ - ownerNonce++ - } - - mockValidators[wallet.address] = newValidators - - fs.writeFileSync(`${outputPath}/validators.json`, JSON.stringify(mockValidators)) + if (!process.env.FACTORY_ADDRESS) throw new Error("No factory address provided") + + const preregisteredOperatorIds = process.env.PREREGISTERED_OPERATOR_IDS?.split(",").map(id => parseInt(id)) || [208, + 209, + 210, + 211/*, 212, 213, 214, 215*/] + if (preregisteredOperatorIds.length < 4) throw new Error("Not enough operator ids provided") + + const accountPath = "m/44'/60'/0'/0/1" + const wallet = ethers.Wallet.fromMnemonic(process.env.BIP39_SEED, accountPath) + + const validatorCount = 4 + const mockValidators = MOCK_VALIDATORS || {} + if (!mockValidators[wallet.address] || Object.keys(mockValidators[wallet.address]).length < validatorCount) { + await run("GOWORK=off make -C lib/dkg build") + + const managerAddress = ethers.utils.getContractAddress({ + from: process.env.FACTORY_ADDRESS, + nonce: 1 + }) + let managerNonce = 3 + let ownerNonce = 0 + + const newValidators: Validator[] = [] + // const newReshares: Reshare[] = [] + + for (let i = 0; i < validatorCount; i++) { + const poolId = i + 1 + console.log("🤖 Creating deposit for", poolId) + + const poolAddress = ethers.utils.getContractAddress({ + from: managerAddress, + nonce: managerNonce + }) + + const selectedOperatorIds = preregisteredOperatorIds.slice(0, 4) + + const dkg = new Dkg({ + cliPath: process.env.CLI_PATH, + configPath: process.env.CONFIG_PATH, + }) + + const validator = await dkg.init({ + poolId, + operatorIds: selectedOperatorIds, + ownerAddress: managerAddress, + ownerNonce, + withdrawalAddress: poolAddress + }) + + newValidators.push(validator) + + // for (let j = 0; j < 2; j++) { + // const oldOperatorIds = selectedOperatorIds.slice(1) + // const reshareOperatorIds = preregisteredOperatorIds.slice(0, 3).concat(preregisteredOperatorIds[4]) + + // const reshare = await dkg.reshare({ + // oldOperatorIds, + // operatorIds: reshareOperatorIds, + // ownerAddress: managerAddress, + // ownerNonce, + // poolId, + // publicKey: validator.publicKey, + // withdrawalAddress: poolAddress + // }) + // newReshares.push(reshare) + // } + // reshareStore[poolId] = newReshares + + managerNonce++ + ownerNonce++ + } + + mockValidators[wallet.address] = newValidators + + fs.writeFileSync(`${outputPath}/validators.json`, JSON.stringify(mockValidators)) // fs.writeFileSync(`${outputPath}/reshares.json`, JSON.stringify(MOCK_RESHARES)) - } + } }() \ No newline at end of file diff --git a/services/oracle/src/index.ts b/services/oracle/src/index.ts index d9064b664..e2c62a5e4 100644 --- a/services/oracle/src/index.ts +++ b/services/oracle/src/index.ts @@ -9,107 +9,107 @@ import { ICasimirFactory } from "@casimir/ethereum/build/@types" import { HandlerInput } from "./interfaces/HandlerInput" import { getConfig } from "./providers/config" import { - depositFunctionsBalanceHandler, - depositUpkeepBalanceHandler, - initiatePoolHandler, - activatePoolsHandler, - resharePoolsHandler, - // exitPoolHandler, - // reportForcedExitsHandler, - reportCompletedExitsHandler + depositFunctionsBalanceHandler, + depositUpkeepBalanceHandler, + initiatePoolHandler, + activatePoolsHandler, + resharePoolsHandler, + // exitPoolHandler, + // reportForcedExitsHandler, + reportCompletedExitsHandler } from "./providers/handlers" import { ManagerConfig } from "@casimir/types" const config = getConfig() void async function () { - try { - const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) - const factory = new ethers.Contract(config.factoryAddress, ICasimirFactoryAbi, provider) as ICasimirFactory - const managerConfigs = await Promise.all((await factory.getManagerIds()).map(async (id) => { - return await factory.getManagerConfig(id) - })) + try { + const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) + const factory = new ethers.Contract(config.factoryAddress, ICasimirFactoryAbi, provider) as ICasimirFactory + const managerConfigs = await Promise.all((await factory.getManagerIds()).map(async (id) => { + return await factory.getManagerConfig(id) + })) - const contracts = { - CasimirManager: { - abi: ICasimirManagerAbi, - addresses: managerConfigs.map(({ managerAddress }) => managerAddress), - events: { - InitiationRequested: initiatePoolHandler - // ExitRequested: exitPoolHandler + const contracts = { + CasimirManager: { + abi: ICasimirManagerAbi, + addresses: managerConfigs.map(({ managerAddress }) => managerAddress), + events: { + InitiationRequested: initiatePoolHandler + // ExitRequested: exitPoolHandler + } + }, + CasimirRegistry: { + abi: ICasimirRegistryAbi, + addresses: managerConfigs.map(({ registryAddress }) => registryAddress), + events: { + DeactivationRequested: resharePoolsHandler + } + }, + CasimirUpkeep: { + abi: ICasimirUpkeepAbi, + addresses: managerConfigs.map(({ upkeepAddress }) => upkeepAddress), + events: { + ActivationsRequested: activatePoolsHandler, + // ForcedExitReportsRequested: reportForcedExitsHandler, + CompletedExitReportsRequested: reportCompletedExitsHandler + } + } } - }, - CasimirRegistry: { - abi: ICasimirRegistryAbi, - addresses: managerConfigs.map(({ registryAddress }) => registryAddress), - events: { - DeactivationRequested: resharePoolsHandler - } - }, - CasimirUpkeep: { - abi: ICasimirUpkeepAbi, - addresses: managerConfigs.map(({ upkeepAddress }) => upkeepAddress), - events: { - ActivationsRequested: activatePoolsHandler, - // ForcedExitReportsRequested: reportForcedExitsHandler, - CompletedExitReportsRequested: reportCompletedExitsHandler - } - } - } - const contractFilters = Object.values(contracts).map((contract) => { - return { - abi: contract.abi, - addresses: contract.addresses, - events: Object.keys(contract.events) - } - }) + const contractFilters = Object.values(contracts).map((contract) => { + return { + abi: contract.abi, + addresses: contract.addresses, + events: Object.keys(contract.events) + } + }) - let startBlock - if (process.env.USE_LOGS === "true") { - startBlock = getStartBlock("block.log") - } + let startBlock + if (process.env.USE_LOGS === "true") { + startBlock = getStartBlock("block.log") + } - const eventsIterable = getEventsIterable({ - contractFilters, - ethereumUrl: config.ethereumUrl, - startBlock - }) + const eventsIterable = getEventsIterable({ + contractFilters, + ethereumUrl: config.ethereumUrl, + startBlock + }) - const handlers: Record Promise> = {} - for (const contract of Object.values(contracts)) { - for (const [event, handler] of Object.entries(contract.events)) { - handlers[event as keyof typeof handlers] = handler - } - } + const handlers: Record Promise> = {} + for (const contract of Object.values(contracts)) { + for (const [event, handler] of Object.entries(contract.events)) { + handlers[event as keyof typeof handlers] = handler + } + } - for await (const event of eventsIterable) { - console.log(`Received ${event.event} event from ${event.address}`) - const managerConfig = managerConfigs.find(({ managerAddress, registryAddress, upkeepAddress }) => { - return [managerAddress, - registryAddress, - upkeepAddress].includes(event.address) - }) - if (!managerConfig) throw new Error(`No manager config found for address ${event.address}`) - const args = event.args as ethers.utils.Result - const handler = handlers[event.event as keyof typeof handlers] - if (!handler) throw new Error(`No handler found for event ${event.event}`) - await depositFunctionsBalanceHandler({ managerConfig }) - await depositUpkeepBalanceHandler({ managerConfig }) - await handler({ managerConfig, args }) - if (process.env.USE_LOGS === "true") { - // Todo check if this possibly misses events - updateStartBlock("block.log", event.blockNumber + 1) - } - } - } catch (error) { - if (process.env.USE_LOGS === "true") { - updateErrorLog("error.log", (error as Error).message) - } else { - console.log(error) + for await (const event of eventsIterable) { + console.log(`Received ${event.event} event from ${event.address}`) + const managerConfig = managerConfigs.find(({ managerAddress, registryAddress, upkeepAddress }) => { + return [managerAddress, + registryAddress, + upkeepAddress].includes(event.address) + }) + if (!managerConfig) throw new Error(`No manager config found for address ${event.address}`) + const args = event.args as ethers.utils.Result + const handler = handlers[event.event as keyof typeof handlers] + if (!handler) throw new Error(`No handler found for event ${event.event}`) + await depositFunctionsBalanceHandler({ managerConfig }) + await depositUpkeepBalanceHandler({ managerConfig }) + await handler({ managerConfig, args }) + if (process.env.USE_LOGS === "true") { + // Todo check if this possibly misses events + updateStartBlock("block.log", event.blockNumber + 1) + } + } + } catch (error) { + if (process.env.USE_LOGS === "true") { + updateErrorLog("error.log", (error as Error).message) + } else { + console.log(error) + } + process.exit(1) } - process.exit(1) - } }() diff --git a/services/oracle/src/providers/config.ts b/services/oracle/src/providers/config.ts index 7ed91882f..68c34c029 100644 --- a/services/oracle/src/providers/config.ts +++ b/services/oracle/src/providers/config.ts @@ -1,51 +1,51 @@ import { ethers } from "ethers" export function getConfig() { - const cliPath = process.env.CLI_PATH - if (!cliPath) throw new Error("No cli path provided") - const configPath = process.env.CONFIG_PATH - if (!configPath) throw new Error("No config path provided") + const cliPath = process.env.CLI_PATH + if (!cliPath) throw new Error("No cli path provided") + const configPath = process.env.CONFIG_PATH + if (!configPath) throw new Error("No config path provided") - const ethereumUrl = process.env.ETHEREUM_RPC_URL - if (!ethereumUrl) throw new Error("No ethereum rpc url provided") + const ethereumUrl = process.env.ETHEREUM_RPC_URL + if (!ethereumUrl) throw new Error("No ethereum rpc url provided") - const mnemonic = process.env.BIP39_SEED - if (!mnemonic) throw new Error("No mnemonic provided") - const accountPath = "m/44'/60'/0'/0/1" - const wallet = ethers.Wallet.fromMnemonic(mnemonic, accountPath) + const mnemonic = process.env.BIP39_SEED + if (!mnemonic) throw new Error("No mnemonic provided") + const accountPath = "m/44'/60'/0'/0/1" + const wallet = ethers.Wallet.fromMnemonic(mnemonic, accountPath) - const factoryAddress = process.env.FACTORY_ADDRESS - if (!factoryAddress) throw new Error("No factory address provided") - const functionsBillingRegistryAddress = process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS - if (!functionsBillingRegistryAddress) throw new Error("No functions billing registry address provided") - const keeperRegistryAddress = process.env.KEEPER_REGISTRY_ADDRESS - if (!keeperRegistryAddress) throw new Error("No link registry address provided") - const linkTokenAddress = process.env.LINK_TOKEN_ADDRESS - if (!linkTokenAddress) throw new Error("No link token address provided") - const ssvNetworkAddress = process.env.SSV_NETWORK_ADDRESS - if (!ssvNetworkAddress) throw new Error("No ssv network address provided") - const ssvTokenAddress = process.env.SSV_TOKEN_ADDRESS - if (!ssvTokenAddress) throw new Error("No ssv token address provided") - const ssvViewsAddress = process.env.SSV_VIEWS_ADDRESS - if (!ssvViewsAddress) throw new Error("No ssv network views address provided") - const uniswapV3FactoryAddress = process.env.SWAP_FACTORY_ADDRESS - if (!uniswapV3FactoryAddress) throw new Error("No uniswap v3 factory address provided") - const wethTokenAddress = process.env.WETH_TOKEN_ADDRESS - if (!wethTokenAddress) throw new Error("No weth token address provided") + const factoryAddress = process.env.FACTORY_ADDRESS + if (!factoryAddress) throw new Error("No factory address provided") + const functionsBillingRegistryAddress = process.env.FUNCTIONS_BILLING_REGISTRY_ADDRESS + if (!functionsBillingRegistryAddress) throw new Error("No functions billing registry address provided") + const keeperRegistryAddress = process.env.KEEPER_REGISTRY_ADDRESS + if (!keeperRegistryAddress) throw new Error("No link registry address provided") + const linkTokenAddress = process.env.LINK_TOKEN_ADDRESS + if (!linkTokenAddress) throw new Error("No link token address provided") + const ssvNetworkAddress = process.env.SSV_NETWORK_ADDRESS + if (!ssvNetworkAddress) throw new Error("No ssv network address provided") + const ssvTokenAddress = process.env.SSV_TOKEN_ADDRESS + if (!ssvTokenAddress) throw new Error("No ssv token address provided") + const ssvViewsAddress = process.env.SSV_VIEWS_ADDRESS + if (!ssvViewsAddress) throw new Error("No ssv network views address provided") + const uniswapV3FactoryAddress = process.env.SWAP_FACTORY_ADDRESS + if (!uniswapV3FactoryAddress) throw new Error("No uniswap v3 factory address provided") + const wethTokenAddress = process.env.WETH_TOKEN_ADDRESS + if (!wethTokenAddress) throw new Error("No weth token address provided") - return { - cliPath, - configPath, - ethereumUrl, - wallet, - factoryAddress, - functionsBillingRegistryAddress, - keeperRegistryAddress, - linkTokenAddress, - ssvNetworkAddress, - ssvTokenAddress, - ssvViewsAddress, - uniswapV3FactoryAddress, - wethTokenAddress - } + return { + cliPath, + configPath, + ethereumUrl, + wallet, + factoryAddress, + functionsBillingRegistryAddress, + keeperRegistryAddress, + linkTokenAddress, + ssvNetworkAddress, + ssvTokenAddress, + ssvViewsAddress, + uniswapV3FactoryAddress, + wethTokenAddress + } } diff --git a/services/oracle/src/providers/dkg.ts b/services/oracle/src/providers/dkg.ts index 4c94aa291..d2bdd2b48 100644 --- a/services/oracle/src/providers/dkg.ts +++ b/services/oracle/src/providers/dkg.ts @@ -7,105 +7,105 @@ import { Reshare, Validator } from "@casimir/types" import { DkgOptions } from "../interfaces/DkgOptions" export class Dkg { - cliPath: string - configPath: string + cliPath: string + configPath: string - constructor(options: DkgOptions) { - this.cliPath = options.cliPath - this.configPath = options.configPath - } + constructor(options: DkgOptions) { + this.cliPath = options.cliPath + this.configPath = options.configPath + } - /** + /** * Init a new DKG and create a validator * @param {InitInput} input - Init input * @param {number} retries - Number of retries * @returns {Promise} New validator */ - async init(input: InitInput, retries: number | undefined = 25): Promise { - try { - const operators = MOCK_OPERATORS.filter((operator) => input.operatorIds.includes(operator.id)) - if (!fs.existsSync("./data")) fs.mkdirSync("./data") - fs.writeFileSync("./data/operators.json", JSON.stringify(operators)) + async init(input: InitInput, retries: number | undefined = 25): Promise { + try { + const operators = MOCK_OPERATORS.filter((operator) => input.operatorIds.includes(operator.id)) + if (!fs.existsSync("./data")) fs.mkdirSync("./data") + fs.writeFileSync("./data/operators.json", JSON.stringify(operators)) - const flags = [ - `--configPath ${this.configPath}`, - `--operatorIDs ${input.operatorIds.join(",")}`, - `--owner ${input.ownerAddress}`, - `--nonce ${input.ownerNonce}`, - `--withdrawAddress ${input.withdrawalAddress.split("0x")[1]}` - ] + const flags = [ + `--configPath ${this.configPath}`, + `--operatorIDs ${input.operatorIds.join(",")}`, + `--owner ${input.ownerAddress}`, + `--nonce ${input.ownerNonce}`, + `--withdrawAddress ${input.withdrawalAddress.split("0x")[1]}` + ] - const command = `${this.cliPath} init ${flags.join(" ")}` - const response = await run(`${command}`) as string + const command = `${this.cliPath} init ${flags.join(" ")}` + const response = await run(`${command}`) as string - const depositFileLine = response.split("Writing deposit data json to file")[1] - const depositFilePath = depositFileLine.split("{\"path\": \"")[1].split("\"}")[0] - const [deposit] = JSON.parse(fs.readFileSync(depositFilePath, "utf8")) - const { deposit_data_root, pubkey, signature, withdrawal_credentials } = deposit + const depositFileLine = response.split("Writing deposit data json to file")[1] + const depositFilePath = depositFileLine.split("{\"path\": \"")[1].split("\"}")[0] + const [deposit] = JSON.parse(fs.readFileSync(depositFilePath, "utf8")) + const { deposit_data_root, pubkey, signature, withdrawal_credentials } = deposit - const keysharesFileLine = response.split("Writing keyshares payload to file")[1] - const keysharesFilePath = keysharesFileLine.split("{\"path\": \"")[1].split("\"}")[0] - const { payload } = JSON.parse(fs.readFileSync(`${keysharesFilePath}`, "utf8")) - const shares = payload.sharesData + const keysharesFileLine = response.split("Writing keyshares payload to file")[1] + const keysharesFilePath = keysharesFileLine.split("{\"path\": \"")[1].split("\"}")[0] + const { payload } = JSON.parse(fs.readFileSync(`${keysharesFilePath}`, "utf8")) + const shares = payload.sharesData - return { - depositDataRoot: `0x${deposit_data_root}`, - publicKey: `0x${pubkey}`, - operatorIds: input.operatorIds, - shares: shares, - signature: `0x${signature}`, - withdrawalCredentials: `0x${withdrawal_credentials}` - } - } catch (error) { - if (retries === 0) { - throw error - } - await new Promise(resolve => setTimeout(resolve, 2500)) - console.log(`Retrying init ${retries} more times`) - return await this.init(input, retries - 1) + return { + depositDataRoot: `0x${deposit_data_root}`, + publicKey: `0x${pubkey}`, + operatorIds: input.operatorIds, + shares: shares, + signature: `0x${signature}`, + withdrawalCredentials: `0x${withdrawal_credentials}` + } + } catch (error) { + if (retries === 0) { + throw error + } + await new Promise(resolve => setTimeout(resolve, 2500)) + console.log(`Retrying init ${retries} more times`) + return await this.init(input, retries - 1) + } } - } - /** + /** * Reshare an existing validator * @param {ReshareInput} input - Reshare input * @param {number} retries - Number of retries * @returns {Promise} Reshared validator */ - async reshare(input: ReshareInput, retries: number | undefined = 25): Promise { - try { - const operators = MOCK_OPERATORS.filter((operator) => input.operatorIds.includes(operator.id)) - if (!fs.existsSync("./data")) fs.mkdirSync("./data") - fs.writeFileSync("./data/operators.json", JSON.stringify(operators)) + async reshare(input: ReshareInput, retries: number | undefined = 25): Promise { + try { + const operators = MOCK_OPERATORS.filter((operator) => input.operatorIds.includes(operator.id)) + if (!fs.existsSync("./data")) fs.mkdirSync("./data") + fs.writeFileSync("./data/operators.json", JSON.stringify(operators)) - const flags = [ - `--configPath ${this.configPath}`, - `--oldOperatorIDs ${input.oldOperatorIds.join(",")}`, - `--operatorIDs ${input.operatorIds.join(",")}` - ] + const flags = [ + `--configPath ${this.configPath}`, + `--oldOperatorIDs ${input.oldOperatorIds.join(",")}`, + `--operatorIDs ${input.operatorIds.join(",")}` + ] - const command = `${this.cliPath} reshare ${flags.join(" ")}` - const response = await run(`${command}`) as string + const command = `${this.cliPath} reshare ${flags.join(" ")}` + const response = await run(`${command}`) as string - const keysharesFileLine = response.split("Writing keyshares payload to file")[1] - const keysharesFilePath = keysharesFileLine.split("{\"path\": \"")[1].split("\"}")[0] - const { payload } = JSON.parse(fs.readFileSync(`${keysharesFilePath}`, "utf8")) - const shares = payload.sharesData + const keysharesFileLine = response.split("Writing keyshares payload to file")[1] + const keysharesFilePath = keysharesFileLine.split("{\"path\": \"")[1].split("\"}")[0] + const { payload } = JSON.parse(fs.readFileSync(`${keysharesFilePath}`, "utf8")) + const shares = payload.sharesData - return { - oldOperatorIds: input.oldOperatorIds, - operatorIds: input.operatorIds, - poolId: input.poolId, - publicKey: input.publicKey, - shares - } - } catch (error) { - if (retries === 0) { - throw error - } - await new Promise(resolve => setTimeout(resolve, 2500)) - console.log(`Retrying reshare ${retries} more times`) - return await this.reshare(input, retries - 1) + return { + oldOperatorIds: input.oldOperatorIds, + operatorIds: input.operatorIds, + poolId: input.poolId, + publicKey: input.publicKey, + shares + } + } catch (error) { + if (retries === 0) { + throw error + } + await new Promise(resolve => setTimeout(resolve, 2500)) + console.log(`Retrying reshare ${retries} more times`) + return await this.reshare(input, retries - 1) + } } - } } diff --git a/services/oracle/src/providers/handlers.ts b/services/oracle/src/providers/handlers.ts index 40a781aa3..78d5962e6 100644 --- a/services/oracle/src/providers/handlers.ts +++ b/services/oracle/src/providers/handlers.ts @@ -15,464 +15,470 @@ import { HandlerInput } from "../interfaces/HandlerInput" const config = getConfig() const dkg = new Dkg({ - cliPath: config.cliPath, - configPath: config.configPath + cliPath: config.cliPath, + configPath: config.configPath }) export async function depositFunctionsBalanceHandler(input: HandlerInput) { - const { managerConfig } = input - const { managerAddress } = managerConfig - - const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) - const signer = config.wallet.connect(provider) - const manager = new ethers.Contract(managerAddress, ICasimirManagerAbi, signer) as ethers.Contract & CasimirManager - const functionsBillingRegistry = new ethers.Contract( - config.functionsBillingRegistryAddress, IFunctionsBillingRegistryAbi, provider - ) as ethers.Contract & IFunctionsBillingRegistry - - const minimumBalance = 0.2 - const refundBalance = 5 - const functionsId = await manager.functionsId() - let balance = 0 - if (functionsId.gt(0)) { - const subscription = await functionsBillingRegistry.getSubscription(functionsId) - balance = Number(ethers.utils.formatEther(subscription.balance).split(".").map((part, index) => { - if (index === 0) return part - return part.slice(0, 1) - }).join(".")) - } - - if (balance < minimumBalance) { - const uniswapFactory = new Factory({ - provider, - uniswapV3FactoryAddress: config.uniswapV3FactoryAddress - }) + const { managerConfig } = input + const { managerAddress } = managerConfig + + const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) + const signer = config.wallet.connect(provider) + const manager = new ethers.Contract(managerAddress, ICasimirManagerAbi, signer) as CasimirManager + const functionsBillingRegistry = new ethers.Contract( + config.functionsBillingRegistryAddress, IFunctionsBillingRegistryAbi, provider + ) as IFunctionsBillingRegistry + + const minimumBalance = 0.2 + const refundBalance = 5 + const functionsId = await manager.functionsId() + let balance = 0 + if (functionsId.gt(0)) { + const subscription = await functionsBillingRegistry.getSubscription(functionsId) + balance = Number(ethers.utils.formatEther(subscription.balance).split(".").map((part, index) => { + if (index === 0) return part + return part.slice(0, 1) + }).join(".")) + } - const price = await uniswapFactory.getSwapPrice({ - tokenIn: config.wethTokenAddress, - tokenOut: config.linkTokenAddress, - uniswapFeeTier: 3000 - }) + if (balance < minimumBalance) { + const uniswapFactory = new Factory({ + provider, + uniswapV3FactoryAddress: config.uniswapV3FactoryAddress + }) - const feeAmount = ethers.utils.parseEther((refundBalance * price).toPrecision(9)) - const minTokenAmount = ethers.utils.parseEther((refundBalance * 0.9).toPrecision(9)) + const price = await uniswapFactory.getSwapPrice({ + tokenIn: config.wethTokenAddress, + tokenOut: config.linkTokenAddress, + uniswapFeeTier: 3000 + }) - const depositFunctionsBalance = await manager.connect(signer).depositFunctionsBalance( - feeAmount, - minTokenAmount, - false - ) - await depositFunctionsBalance.wait() - } + const feeAmount = ethers.utils.parseEther((refundBalance * price).toPrecision(9)) + const minTokenAmount = ethers.utils.parseEther((refundBalance * 0.9).toPrecision(9)) + + const depositFunctionsBalance = await manager.connect(signer).depositFunctionsBalance( + feeAmount, + minTokenAmount, + false + ) + await depositFunctionsBalance.wait() + } } export async function depositUpkeepBalanceHandler(input: HandlerInput) { - const { managerConfig } = input - const { managerAddress } = managerConfig - - const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) - const signer = config.wallet.connect(provider) - const manager = new ethers.Contract(managerAddress, ICasimirManagerAbi, signer) as ethers.Contract & CasimirManager - const keeperRegistry = new ethers.Contract( - config.keeperRegistryAddress, IAutomationRegistryAbi, provider - ) as ethers.Contract & IAutomationRegistry - - const minimumBalance = 6.5 - const refundBalance = 13 - const upkeepId = await manager.upkeepId() - let balance = 0 - if (upkeepId.gt(0)) { - const subscription = await keeperRegistry.getUpkeep(upkeepId) - balance = Number(ethers.utils.formatEther(subscription.balance).split(".").map((part, index) => { - if (index === 0) return part - return part.slice(0, 1) - }).join(".")) - } - - if (balance < minimumBalance) { - const uniswapFactory = new Factory({ - provider, - uniswapV3FactoryAddress: config.uniswapV3FactoryAddress - }) + const { managerConfig } = input + const { managerAddress } = managerConfig + + const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) + const signer = config.wallet.connect(provider) + const manager = new ethers.Contract(managerAddress, ICasimirManagerAbi, signer) as CasimirManager + const keeperRegistry = new ethers.Contract( + config.keeperRegistryAddress, IAutomationRegistryAbi, provider + ) as IAutomationRegistry + + const minimumBalance = 6.5 + const refundBalance = 13 + const upkeepId = await manager.upkeepId() + let balance = 0 + if (upkeepId.gt(0)) { + const subscription = await keeperRegistry.getUpkeep(upkeepId) + balance = Number(ethers.utils.formatEther(subscription.balance).split(".").map((part, index) => { + if (index === 0) return part + return part.slice(0, 1) + }).join(".")) + } - const price = await uniswapFactory.getSwapPrice({ - tokenIn: config.wethTokenAddress, - tokenOut: config.linkTokenAddress, - uniswapFeeTier: 3000 - }) + if (balance < minimumBalance) { + const uniswapFactory = new Factory({ + provider, + uniswapV3FactoryAddress: config.uniswapV3FactoryAddress + }) + + const price = await uniswapFactory.getSwapPrice({ + tokenIn: config.wethTokenAddress, + tokenOut: config.linkTokenAddress, + uniswapFeeTier: 3000 + }) - const feeAmount = ethers.utils.parseEther((refundBalance * price).toPrecision(9)) - const minTokenAmount = ethers.utils.parseEther((refundBalance * 0.9).toPrecision(9)) + const feeAmount = ethers.utils.parseEther((refundBalance * price).toPrecision(9)) + const minTokenAmount = ethers.utils.parseEther((refundBalance * 0.9).toPrecision(9)) - const depositUpkeepBalance = await manager.connect(signer).depositUpkeepBalance( - feeAmount, - minTokenAmount, - false - ) - await depositUpkeepBalance.wait() - } + const depositUpkeepBalance = await manager.connect(signer).depositUpkeepBalance( + feeAmount, + minTokenAmount, + false + ) + await depositUpkeepBalance.wait() + } } export async function initiatePoolHandler(input: HandlerInput) { - const { managerConfig, args } = input - const { managerAddress, registryAddress, viewsAddress } = managerConfig - const poolId = args?.poolId - if (!poolId) throw new Error("No pool id provided") - - const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) - const signer = config.wallet.connect(provider) - const manager = new ethers.Contract(managerAddress, ICasimirManagerAbi, signer) as ethers.Contract & CasimirManager - const views = new ethers.Contract(viewsAddress, CasimirViewsAbi, provider) as ethers.Contract & CasimirViews - const registry = new ethers.Contract( - registryAddress, CasimirRegistryAbi, provider - ) as ethers.Contract & CasimirRegistry - - const managerNonce = await provider.getTransactionCount(manager.address) - const poolAddress = ethers.utils.getContractAddress({ - from: manager.address, - nonce: managerNonce - }) - - const operatorCount = (await registry.getOperatorIds()).length - const operators = await views.getOperators(0, operatorCount) - - const eligibleOperators = operators.filter((operator) => { - const operatorCollateral = parseInt(ethers.utils.formatEther(operator.collateral)) - const operatorPoolCount = parseInt(operator.poolCount.toString()) - const availableCollateral = operatorCollateral - operatorPoolCount - return operator.active && !operator.resharing && availableCollateral > 0 - }) - - const smallestOperators = eligibleOperators.sort((a, b) => { - const aPoolCount = parseInt(a.poolCount.toString()) - const bPoolCount = parseInt(b.poolCount.toString()) - if (aPoolCount < bPoolCount) return -1 - if (aPoolCount > bPoolCount) return 1 - return 0 - }) - - const selectedOperatorIds = smallestOperators.slice(0, 4).map((operator) => operator.id.toNumber()) - console.log("🤖 Selected operators", selectedOperatorIds) - - const scanner = new Scanner({ - ethereumUrl: config.ethereumUrl, - ssvNetworkAddress: config.ssvNetworkAddress, - ssvViewsAddress: config.ssvViewsAddress - }) - - const ownerNonce = await scanner.getNonce(manager.address) - - const validator = await dkg.init({ - operatorIds: selectedOperatorIds, - ownerAddress: manager.address, - ownerNonce, - poolId, - withdrawalAddress: poolAddress - }) - - const { - depositDataRoot, - publicKey, - signature, - withdrawalCredentials, - operatorIds, - shares - } = validator - - const initiatePool = await manager.initiatePool( - depositDataRoot, - publicKey, - signature, - withdrawalCredentials, - operatorIds, - shares - ) - await initiatePool.wait() -} + const { managerConfig, args } = input + const { managerAddress, registryAddress, viewsAddress } = managerConfig + const poolId = args?.poolId + if (!poolId) throw new Error("No pool id provided") + + const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) + const signer = config.wallet.connect(provider) + const manager = new ethers.Contract(managerAddress, ICasimirManagerAbi, signer) as CasimirManager + const views = new ethers.Contract(viewsAddress, CasimirViewsAbi, provider) as CasimirViews + const registry = new ethers.Contract( + registryAddress, CasimirRegistryAbi, provider + ) as CasimirRegistry + + const managerNonce = await provider.getTransactionCount(manager.address) + const poolAddress = ethers.utils.getContractAddress({ + from: manager.address, + nonce: managerNonce + }) -export async function activatePoolsHandler(input: HandlerInput) { - const { managerConfig, args } = input - const { managerAddress, viewsAddress } = managerConfig - const count = args?.count - if (!count) throw new Error("No count provided") - console.log("🤖 Activate pools", count) + const operatorCount = (await registry.getOperatorIds()).length + const operators = await views.getOperators(0, operatorCount) - const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) - const signer = config.wallet.connect(provider) - const manager = new ethers.Contract(managerAddress, ICasimirManagerAbi, signer) as ethers.Contract & CasimirManager - const views = new ethers.Contract(viewsAddress, CasimirViewsAbi, provider) as ethers.Contract & CasimirViews + const eligibleOperators = operators.filter((operator) => { + const operatorCollateral = parseInt(ethers.utils.formatEther(operator.collateral)) + const operatorPoolCount = parseInt(operator.poolCount.toString()) + const availableCollateral = operatorCollateral - operatorPoolCount + return operator.active && !operator.resharing && availableCollateral > 0 + }) + + const smallestOperators = eligibleOperators.sort((a, b) => { + const aPoolCount = parseInt(a.poolCount.toString()) + const bPoolCount = parseInt(b.poolCount.toString()) + if (aPoolCount < bPoolCount) return -1 + if (aPoolCount > bPoolCount) return 1 + return 0 + }) - for (let i = 0; i < count; i++) { - const pendingPoolIds = await manager.getPendingPoolIds() - if (!pendingPoolIds.length) throw new Error("No pending pools") + const selectedOperatorIds = smallestOperators.slice(0, 4).map((operator) => operator.id.toNumber()) + console.log("🤖 Selected operators", selectedOperatorIds) - /** + const scanner = new Scanner({ + ethereumUrl: config.ethereumUrl, + ssvNetworkAddress: config.ssvNetworkAddress, + ssvViewsAddress: config.ssvViewsAddress + }) + + const ownerNonce = await scanner.getNonce(manager.address) + + const validator = await dkg.init({ + operatorIds: selectedOperatorIds, + ownerAddress: manager.address, + ownerNonce, + poolId, + withdrawalAddress: poolAddress + }) + + const { + depositDataRoot, + publicKey, + signature, + withdrawalCredentials, + operatorIds, + shares + } = validator + + const initiatePool = await manager.initiatePool( + depositDataRoot, + publicKey, + signature, + withdrawalCredentials, + operatorIds, + shares + ) + await initiatePool.wait() +} + +export async function activatePoolsHandler(input: HandlerInput) { + const { managerConfig, args } = input + const { managerAddress, viewsAddress } = managerConfig + const count = args?.count + if (!count) throw new Error("No count provided") + console.log("🤖 Activate pools", count) + + const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) + const signer = config.wallet.connect(provider) + const manager = new ethers.Contract(managerAddress, ICasimirManagerAbi, signer) as CasimirManager + const views = new ethers.Contract(viewsAddress, CasimirViewsAbi, provider) as CasimirViews + + for (let i = 0; i < count; i++) { + const pendingPoolIds = await manager.getPendingPoolIds() + if (!pendingPoolIds.length) throw new Error("No pending pools") + + /** * In production, we check the pending pool status on Beacon before activating * Here, we're just grabbing the next pending pool */ - const pendingPoolIndex = 0 - const poolId = pendingPoolIds[pendingPoolIndex] - const poolConfig = await views.getPoolConfig(poolId) - const operatorIds = poolConfig.operatorIds.map((operatorId) => operatorId.toNumber()) + const pendingPoolIndex = 0 + const poolId = pendingPoolIds[pendingPoolIndex] + const poolConfig = await views.getPoolConfig(poolId) + const operatorIds = poolConfig.operatorIds.map((operatorId) => operatorId.toNumber()) - const scanner = new Scanner({ - ethereumUrl: config.ethereumUrl, - ssvNetworkAddress: config.ssvNetworkAddress, - ssvViewsAddress: config.ssvViewsAddress - }) + const scanner = new Scanner({ + ethereumUrl: config.ethereumUrl, + ssvNetworkAddress: config.ssvNetworkAddress, + ssvViewsAddress: config.ssvViewsAddress + }) - const cluster = await scanner.getCluster({ - ownerAddress: manager.address, - operatorIds - }) + const cluster = await scanner.getCluster({ + ownerAddress: manager.address, + operatorIds + }) - const requiredFee = await scanner.getRequiredFee(operatorIds) + const requiredFee = await scanner.getRequiredFee(operatorIds) - const uniswapFactory = new Factory({ - ethereumUrl: config.ethereumUrl, - uniswapV3FactoryAddress: config.uniswapV3FactoryAddress - }) + const uniswapFactory = new Factory({ + ethereumUrl: config.ethereumUrl, + uniswapV3FactoryAddress: config.uniswapV3FactoryAddress + }) - const price = await uniswapFactory.getSwapPrice({ - tokenIn: config.wethTokenAddress, - tokenOut: config.ssvTokenAddress, - uniswapFeeTier: 3000 - }) + const price = await uniswapFactory.getSwapPrice({ + tokenIn: config.wethTokenAddress, + tokenOut: config.ssvTokenAddress, + uniswapFeeTier: 3000 + }) - const feeAmount = ethers.utils.parseEther((Number(ethers.utils.formatEther(requiredFee)) * price).toPrecision(9)) - const formattedRequiredFee = Number(ethers.utils.formatEther(requiredFee)) * 0.99 - const minTokenAmount = ethers.utils.parseEther((formattedRequiredFee).toPrecision(9)) + const feeAmount = + ethers.utils.parseEther((Number(ethers.utils.formatEther(requiredFee)) * price).toPrecision(9)) + const formattedRequiredFee = Number(ethers.utils.formatEther(requiredFee)) * 0.99 + const minTokenAmount = ethers.utils.parseEther((formattedRequiredFee).toPrecision(9)) - const activatePool = await manager.connect(signer).activatePool( - pendingPoolIndex, - cluster, - feeAmount, - minTokenAmount, - false - ) - await activatePool.wait() - } + const activatePool = await manager.connect(signer).activatePool( + pendingPoolIndex, + cluster, + feeAmount, + minTokenAmount, + false + ) + await activatePool.wait() + } } export async function resharePoolsHandler(input: HandlerInput) { - const { args, managerConfig } = input - const { managerAddress, registryAddress, viewsAddress } = managerConfig - const operatorId = args?.operatorId - if (!operatorId) throw new Error("No operator id provided") - - const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) - const signer = config.wallet.connect(provider) - const manager = new ethers.Contract(managerAddress, ICasimirManagerAbi, signer) as ethers.Contract & CasimirManager - const views = new ethers.Contract(viewsAddress, CasimirViewsAbi, provider) as ethers.Contract & CasimirViews - const registry = new ethers.Contract( - registryAddress, CasimirRegistryAbi, provider - ) as ethers.Contract & CasimirRegistry - - const poolIds = [ - ...await manager.getPendingPoolIds(), ...await manager.getStakedPoolIds() - ] - - for (const poolId of poolIds) { - const poolConfig = await views.getPoolConfig(poolId) - const oldOperatorIds = poolConfig.operatorIds.map(id => id.toNumber()) - if (oldOperatorIds.includes(operatorId)) { - const poolAddress = await manager.getPoolAddress(poolId) - - const operatorCount = (await registry.getOperatorIds()).length - const operators = await views.getOperators(0, operatorCount) + const { args, managerConfig } = input + const { managerAddress, registryAddress, viewsAddress } = managerConfig + const operatorId = args?.operatorId + if (!operatorId) throw new Error("No operator id provided") + + const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) + const signer = config.wallet.connect(provider) + const manager = new ethers.Contract(managerAddress, ICasimirManagerAbi, signer) as ethers.Contract & CasimirManager + const views = new ethers.Contract(viewsAddress, CasimirViewsAbi, provider) as CasimirViews + const registry = new ethers.Contract( + registryAddress, CasimirRegistryAbi, provider + ) as CasimirRegistry + + const poolIds = [ + ...await manager.getPendingPoolIds(), ...await manager.getStakedPoolIds() + ] + + for (const poolId of poolIds) { + const poolConfig = await views.getPoolConfig(poolId) + const oldOperatorIds = poolConfig.operatorIds.map(id => id.toNumber()) + if (oldOperatorIds.includes(operatorId)) { + const poolAddress = await manager.getPoolAddress(poolId) + + const operatorCount = (await registry.getOperatorIds()).length + const operators = await views.getOperators(0, operatorCount) - const eligibleOperators = operators.filter((operator) => { - const operatorCollateral = parseInt(ethers.utils.formatEther(operator.collateral)) - const operatorPoolCount = parseInt(operator.poolCount.toString()) - const availableCollateral = operatorCollateral - operatorPoolCount - return operator.active && !operator.resharing && availableCollateral > 0 - }) + const eligibleOperators = operators.filter((operator) => { + const operatorCollateral = parseInt(ethers.utils.formatEther(operator.collateral)) + const operatorPoolCount = parseInt(operator.poolCount.toString()) + const availableCollateral = operatorCollateral - operatorPoolCount + return operator.active && !operator.resharing && availableCollateral > 0 + }) - const smallestOperators = eligibleOperators.sort((a, b) => { - const aPoolCount = parseInt(a.poolCount.toString()) - const bPoolCount = parseInt(b.poolCount.toString()) - if (aPoolCount < bPoolCount) return -1 - if (aPoolCount > bPoolCount) return 1 - return 0 - }) + const smallestOperators = eligibleOperators.sort((a, b) => { + const aPoolCount = parseInt(a.poolCount.toString()) + const bPoolCount = parseInt(b.poolCount.toString()) + if (aPoolCount < bPoolCount) return -1 + if (aPoolCount > bPoolCount) return 1 + return 0 + }) - const newOperatorId = smallestOperators.find((operator) => !oldOperatorIds.includes(operator.id.toNumber()))?.id.toNumber() - console.log("🤖 New selected operator", newOperatorId) - - if (newOperatorId && poolConfig.reshares.toNumber() < 2) { - const operatorIds = oldOperatorIds.map((id) => { - if (id === operatorId) return newOperatorId - return id - }) + const newOperatorId = + smallestOperators.find((operator) => !oldOperatorIds.includes(operator.id.toNumber()))?.id.toNumber() + console.log("🤖 New selected operator", newOperatorId) + + if (newOperatorId && poolConfig.reshares.toNumber() < 2) { + const operatorIds = oldOperatorIds.map((id) => { + if (id === operatorId) return newOperatorId + return id + }) - const scanner = new Scanner({ - ethereumUrl: config.ethereumUrl, - ssvNetworkAddress: config.ssvNetworkAddress, - ssvViewsAddress: config.ssvViewsAddress - }) + const scanner = new Scanner({ + ethereumUrl: config.ethereumUrl, + ssvNetworkAddress: config.ssvNetworkAddress, + ssvViewsAddress: config.ssvViewsAddress + }) - const oldCluster = await scanner.getCluster({ - operatorIds: oldOperatorIds, - ownerAddress: manager.address - }) + const oldCluster = await scanner.getCluster({ + operatorIds: oldOperatorIds, + ownerAddress: manager.address + }) - const cluster = await scanner.getCluster({ - operatorIds, - ownerAddress: manager.address - }) + const cluster = await scanner.getCluster({ + operatorIds, + ownerAddress: manager.address + }) - const ownerNonce = await scanner.getNonce(manager.address) + const ownerNonce = await scanner.getNonce(manager.address) - const requiredFee = await scanner.getRequiredFee(operatorIds) + const requiredFee = await scanner.getRequiredFee(operatorIds) - const reshare = await dkg.reshare({ - oldOperatorIds, - operatorIds, - poolId, - publicKey: poolConfig.publicKey - }) + const reshare = await dkg.reshare({ + oldOperatorIds, + operatorIds, + poolId, + publicKey: poolConfig.publicKey + }) - const uniswapFactory = new Factory({ - ethereumUrl: config.ethereumUrl, - uniswapV3FactoryAddress: config.uniswapV3FactoryAddress - }) + const uniswapFactory = new Factory({ + ethereumUrl: config.ethereumUrl, + uniswapV3FactoryAddress: config.uniswapV3FactoryAddress + }) - const price = await uniswapFactory.getSwapPrice({ - tokenIn: config.wethTokenAddress, - tokenOut: config.ssvTokenAddress, - uniswapFeeTier: 3000 - }) + const price = await uniswapFactory.getSwapPrice({ + tokenIn: config.wethTokenAddress, + tokenOut: config.ssvTokenAddress, + uniswapFeeTier: 3000 + }) - const requiredFeeSubOldClusterBalance = requiredFee.sub(oldCluster.balance) - const feeAmount = ethers.utils.parseEther((Number(ethers.utils.formatEther(requiredFeeSubOldClusterBalance)) * Number(price)).toPrecision(9)) - const minTokenAmount = ethers.utils.parseEther((Number(ethers.utils.formatEther(requiredFee.sub(oldCluster.balance))) * 0.99).toPrecision(9)) - - const reportReshare = await manager.reportReshare( - poolId, - operatorIds, - newOperatorId, - operatorId, - reshare.shares, - cluster, - oldCluster, - feeAmount, - minTokenAmount, - false - ) - await reportReshare.wait() - } else { - // Exit pool - } + const requiredFeeSubOldClusterBalance = requiredFee.sub(oldCluster.balance) + const feeAmount = ethers.utils.parseEther( + (Number(ethers.utils.formatEther(requiredFeeSubOldClusterBalance)) * Number(price)).toPrecision(9) + ) + const minTokenAmount = ethers.utils.parseEther( + (Number(ethers.utils.formatEther(requiredFee.sub(oldCluster.balance))) * 0.99).toPrecision(9) + ) + + const reportReshare = await manager.reportReshare( + poolId, + operatorIds, + newOperatorId, + operatorId, + reshare.shares, + cluster, + oldCluster, + feeAmount, + minTokenAmount, + false + ) + await reportReshare.wait() + } else { + // Exit pool + } + } } - } } export async function initiateExitsHandler(input: HandlerInput) { - const { managerConfig, args } = input - const { managerAddress, viewsAddress } = managerConfig - const poolId = args?.poolId - if (!poolId) throw new Error("No pool id provided") + const { managerConfig, args } = input + const { managerAddress, viewsAddress } = managerConfig + const poolId = args?.poolId + if (!poolId) throw new Error("No pool id provided") - const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) - const manager = new ethers.Contract(managerAddress, ICasimirManagerAbi, provider) as ethers.Contract & CasimirManager - const views = new ethers.Contract(viewsAddress, CasimirViewsAbi, provider) as ethers.Contract & CasimirViews + const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) + const manager = new ethers.Contract(managerAddress, ICasimirManagerAbi, provider) as CasimirManager + const views = new ethers.Contract(viewsAddress, CasimirViewsAbi, provider) as CasimirViews - // Get pool to exit - const poolConfig = await views.getPoolConfig(poolId) + // Get pool to exit + const poolConfig = await views.getPoolConfig(poolId) - // Get operators to sign exit + // Get operators to sign exit } export async function reportForcedExitsHandler(input: HandlerInput) { - const { managerConfig, args } = input - const { managerAddress, viewsAddress } = managerConfig - const count = args?.count - if (!count) throw new Error("No count provided") - - const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) - const signer = config.wallet.connect(provider) - const manager = new ethers.Contract(managerAddress, ICasimirManagerAbi, signer) as ethers.Contract & CasimirManager - const views = new ethers.Contract(viewsAddress, CasimirViewsAbi, provider) as ethers.Contract & CasimirViews - - const stakedPoolIds = await manager.getStakedPoolIds() - let poolIndex = 0 - let remaining = count - while (remaining > 0) { - const poolId = stakedPoolIds[poolIndex] - const poolConfig = await views.getPoolConfig(poolId) - if (poolConfig.status === PoolStatus.ACTIVE) { - remaining-- - const reportForcedExit = await manager.reportForcedExit( - poolIndex - ) - await reportForcedExit.wait() + const { managerConfig, args } = input + const { managerAddress, viewsAddress } = managerConfig + const count = args?.count + if (!count) throw new Error("No count provided") + + const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) + const signer = config.wallet.connect(provider) + const manager = new ethers.Contract(managerAddress, ICasimirManagerAbi, signer) as ethers.Contract & CasimirManager + const views = new ethers.Contract(viewsAddress, CasimirViewsAbi, provider) as CasimirViews + + const stakedPoolIds = await manager.getStakedPoolIds() + let poolIndex = 0 + let remaining = count + while (remaining > 0) { + const poolId = stakedPoolIds[poolIndex] + const poolConfig = await views.getPoolConfig(poolId) + if (poolConfig.status === PoolStatus.ACTIVE) { + remaining-- + const reportForcedExit = await manager.reportForcedExit( + poolIndex + ) + await reportForcedExit.wait() + } + poolIndex++ } - poolIndex++ - } } export async function reportCompletedExitsHandler(input: HandlerInput) { - const { managerConfig, args } = input - const { managerAddress, viewsAddress } = managerConfig - const count = args?.count - if (!count) throw new Error("No count provided") + const { managerConfig, args } = input + const { managerAddress, viewsAddress } = managerConfig + const count = args?.count + if (!count) throw new Error("No count provided") - const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) - const signer = config.wallet.connect(provider) - const manager = new ethers.Contract(managerAddress, ICasimirManagerAbi, signer) as ethers.Contract & CasimirManager - const views = new ethers.Contract(viewsAddress, CasimirViewsAbi, provider) as ethers.Contract & CasimirViews + const provider = new ethers.providers.JsonRpcProvider(config.ethereumUrl) + const signer = config.wallet.connect(provider) + const manager = new ethers.Contract(managerAddress, ICasimirManagerAbi, signer) as CasimirManager + const views = new ethers.Contract(viewsAddress, CasimirViewsAbi, provider) as CasimirViews - /** + /** * In production, we get the completed exit order from the Beacon API (sorting by withdrawn epoch) * We check all validators using: * const stakedPublicKeys = await views.getStakedPublicKeys(startIndex, endIndex) * Here, we're just grabbing the next exiting pool for each completed exit */ - const stakedPoolIds = await manager.getStakedPoolIds() - let remaining = count - let poolIndex = 0 - while (remaining > 0) { - const poolId = stakedPoolIds[poolIndex] - const poolConfig = await views.getPoolConfig(poolId) - if (poolConfig.status === PoolStatus.EXITING_FORCED || poolConfig.status === PoolStatus.EXITING_REQUESTED) { - remaining-- + const stakedPoolIds = await manager.getStakedPoolIds() + let remaining = count + let poolIndex = 0 + while (remaining > 0) { + const poolId = stakedPoolIds[poolIndex] + const poolConfig = await views.getPoolConfig(poolId) + if (poolConfig.status === PoolStatus.EXITING_FORCED || poolConfig.status === PoolStatus.EXITING_REQUESTED) { + remaining-- - /** + /** * In production, we use the SSV performance data to determine blame * We check all validators using: * const stakedPublicKeys = await views.getStakedPublicKeys(startIndex, endIndex) * Here, we're just hardcoding blame to the first operator if less than 32 ETH */ - const operatorIds = poolConfig.operatorIds.map((operatorId) => operatorId.toNumber()) - let blamePercents = [0, - 0, - 0, - 0] - if (poolConfig.balance.lt(ethers.utils.parseEther("32"))) { - blamePercents = [100, - 0, - 0, - 0] - } - - const scanner = new Scanner({ - ethereumUrl: config.ethereumUrl, - ssvNetworkAddress: config.ssvNetworkAddress, - ssvViewsAddress: config.ssvViewsAddress - }) - - const cluster = await scanner.getCluster({ - ownerAddress: manager.address, - operatorIds - }) - - const reportCompletedExit = await manager.reportCompletedExit( - poolIndex, - blamePercents, - cluster - ) - await reportCompletedExit.wait() + const operatorIds = poolConfig.operatorIds.map((operatorId) => operatorId.toNumber()) + let blamePercents = [0, + 0, + 0, + 0] + if (poolConfig.balance.lt(ethers.utils.parseEther("32"))) { + blamePercents = [100, + 0, + 0, + 0] + } + + const scanner = new Scanner({ + ethereumUrl: config.ethereumUrl, + ssvNetworkAddress: config.ssvNetworkAddress, + ssvViewsAddress: config.ssvViewsAddress + }) + + const cluster = await scanner.getCluster({ + ownerAddress: manager.address, + operatorIds + }) + + const reportCompletedExit = await manager.reportCompletedExit( + poolIndex, + blamePercents, + cluster + ) + await reportCompletedExit.wait() + } + poolIndex++ } - poolIndex++ - } } \ No newline at end of file diff --git a/services/redirect/src/index.ts b/services/redirect/src/index.ts index 6da7b73a3..759b283e0 100644 --- a/services/redirect/src/index.ts +++ b/services/redirect/src/index.ts @@ -1,7 +1,7 @@ // eslint-disable-next-line @typescript-eslint/no-unused-vars function handler(event: AWSCloudFrontFunction.Event) { - if (!event.request.uri.includes(".")) { - event.request.uri += ".html" - } - return event.request + if (!event.request.uri.includes(".")) { + event.request.uri += ".html" + } + return event.request } \ No newline at end of file diff --git a/services/users/scripts/clean.ts b/services/users/scripts/clean.ts index 685986d3b..befe15ebe 100644 --- a/services/users/scripts/clean.ts +++ b/services/users/scripts/clean.ts @@ -4,8 +4,8 @@ import { run } from "@casimir/shell" * Clean up users resources */ void async function () { - const resourceDir = "./scripts" - const stackName = "casimir-users-db" - await run(`rm -rf ${resourceDir}/.out`) - await run(`docker compose -p ${stackName} -f ${resourceDir}/docker-compose.yaml down`) + const resourceDir = "./scripts" + const stackName = "casimir-users-db" + await run(`rm -rf ${resourceDir}/.out`) + await run(`docker compose -p ${stackName} -f ${resourceDir}/docker-compose.yaml down`) }() \ No newline at end of file diff --git a/services/users/scripts/db.ts b/services/users/scripts/db.ts index fa4cb6fe3..4aa1b5f10 100644 --- a/services/users/scripts/db.ts +++ b/services/users/scripts/db.ts @@ -9,66 +9,66 @@ import { JsonSchema, Schema, accountSchema, nonceSchema, operatorSchema, userSch */ void async function () { - if (process.env.STAGE !== "local") { - await loadCredentials() - const dbCredentials = await getSecret(`${process.env.PROJECT}-users-db-credentials-${process.env.STAGE}`) - const { - port: dbPort, - host: dbHost, - dbname: dbName, - username: dbUser, - password: dbPassword - } = JSON.parse(dbCredentials as string) - process.env.DB_HOST = dbHost - process.env.DB_PORT = dbPort - process.env.DB_NAME = dbName - process.env.DB_USER = dbUser - process.env.DB_PASSWORD = dbPassword - const sessionsCredentials = await getSecret(`${process.env.PROJECT}-sessions-credentials-${process.env.STAGE}`) - const { host: sessionsHost, key: sessionsKey } = JSON.parse(sessionsCredentials as string) - process.env.SESSIONS_HOST = sessionsHost - process.env.SESSIONS_KEY = sessionsKey - } + if (process.env.STAGE !== "local") { + await loadCredentials() + const dbCredentials = await getSecret(`${process.env.PROJECT}-users-db-credentials-${process.env.STAGE}`) + const { + port: dbPort, + host: dbHost, + dbname: dbName, + username: dbUser, + password: dbPassword + } = JSON.parse(dbCredentials as string) + process.env.DB_HOST = dbHost + process.env.DB_PORT = dbPort + process.env.DB_NAME = dbName + process.env.DB_USER = dbUser + process.env.DB_PASSWORD = dbPassword + const sessionsCredentials = await getSecret(`${process.env.PROJECT}-sessions-credentials-${process.env.STAGE}`) + const { host: sessionsHost, key: sessionsKey } = JSON.parse(sessionsCredentials as string) + process.env.SESSIONS_HOST = sessionsHost + process.env.SESSIONS_KEY = sessionsKey + } - const resourceDir = "./scripts" + const resourceDir = "./scripts" - const tableSchemas = { - account: accountSchema, - operator: operatorSchema, - nonce: nonceSchema, - user: userSchema, - userAccount: userAccountSchema - } + const tableSchemas = { + account: accountSchema, + operator: operatorSchema, + nonce: nonceSchema, + user: userSchema, + userAccount: userAccountSchema + } - let sqlSchema = "" - for (const table of Object.keys(tableSchemas)) { - const tableSchema = tableSchemas[table] as JsonSchema - const schema = new Schema(tableSchema) - const postgresTable = schema.getPostgresTable() - console.log(`${schema.getTitle()} JSON schema parsed to SQL`) - sqlSchema += `${postgresTable}\n\n` - } + let sqlSchema = "" + for (const table of Object.keys(tableSchemas)) { + const tableSchema = tableSchemas[table] as JsonSchema + const schema = new Schema(tableSchema) + const postgresTable = schema.getPostgresTable() + console.log(`${schema.getTitle()} JSON schema parsed to SQL`) + sqlSchema += `${postgresTable}\n\n` + } - const sqlDir = `${resourceDir}/.out/sql` - if (!fs.existsSync(sqlDir)) fs.mkdirSync(sqlDir, { recursive: true }) - fs.writeFileSync(`${sqlDir}/schema.sql`, sqlSchema) + const sqlDir = `${resourceDir}/.out/sql` + if (!fs.existsSync(sqlDir)) fs.mkdirSync(sqlDir, { recursive: true }) + fs.writeFileSync(`${sqlDir}/schema.sql`, sqlSchema) - const stackName = "casimir-users-db" - await run(`docker compose -p ${stackName} -f ${resourceDir}/docker-compose.yaml up -d`) - let dbReady = false - while (!dbReady) { - const health = await run("docker inspect --format='{{lower .State.Health.Status}}' postgres") as string - dbReady = health.trim() === "healthy" - await new Promise(resolve => setTimeout(resolve, 2500)) - } - const atlas = await run("which atlas") as string - if (!atlas || atlas.includes("not found")) { - if (os.platform() === "darwin") { - await run("echo y | brew install atlas") - } else { - throw new Error("Please install atlas using `curl -sSf https://atlasgo.sh | sh`") + const stackName = "casimir-users-db" + await run(`docker compose -p ${stackName} -f ${resourceDir}/docker-compose.yaml up -d`) + let dbReady = false + while (!dbReady) { + const health = await run("docker inspect --format='{{lower .State.Health.Status}}' postgres") as string + dbReady = health.trim() === "healthy" + await new Promise(resolve => setTimeout(resolve, 2500)) + } + const atlas = await run("which atlas") as string + if (!atlas || atlas.includes("not found")) { + if (os.platform() === "darwin") { + await run("echo y | brew install atlas") + } else { + throw new Error("Please install atlas using `curl -sSf https://atlasgo.sh | sh`") + } } - } - await run(`atlas schema apply --url "postgres://postgres:password@localhost:5432/users?sslmode=disable" --to "file://${sqlDir}/schema.sql" --dev-url "docker://postgres/15" --auto-approve`) + await run(`atlas schema apply --url "postgres://postgres:password@localhost:5432/users?sslmode=disable" --to "file://${sqlDir}/schema.sql" --dev-url "docker://postgres/15" --auto-approve`) }() \ No newline at end of file diff --git a/services/users/src/index.ts b/services/users/src/index.ts index 4da31c145..bd8c0ef2b 100644 --- a/services/users/src/index.ts +++ b/services/users/src/index.ts @@ -14,15 +14,15 @@ app.use(express.json()) /** CORS needs explicit origin (no *) with credentials:true */ app.use( - cors({ - origin: process.env.WEB_URL || "http://localhost:3001", - allowedHeaders: ["content-type", ...supertokens.getAllCORSHeaders()], - methods: ["GET", - "PUT", - "POST", - "DELETE"], - credentials: true - }) + cors({ + origin: process.env.WEB_URL || "http://localhost:3001", + allowedHeaders: ["content-type", ...supertokens.getAllCORSHeaders()], + methods: ["GET", + "PUT", + "POST", + "DELETE"], + credentials: true + }) ) /** Expose all the APIs from SuperTokens to the client */ @@ -38,21 +38,21 @@ app.use(errorHandler()) /* Handle 500 errors */ app.use((err: any, req: express.Request, res: express.Response, next: express.NextFunction) => { - // Log the error stack trace - console.error(`Error stack trace in middleware: ${err.stack}`) - console.error(`Error message in middleware: ${err.message}`) + // Log the error stack trace + console.error(`Error stack trace in middleware: ${err.stack}`) + console.error(`Error message in middleware: ${err.message}`) - // Check if headers have already been sent to the client - if (res.headersSent) { - return next(err) - } - - res.status(500).json({ - error: true, - message: "Server error." - }) + // Check if headers have already been sent to the client + if (res.headersSent) { + return next(err) + } + + res.status(500).json({ + error: true, + message: "Server error." + }) }) app.listen(4000, () => { - console.log("Users server listening on port 4000") + console.log("Users server listening on port 4000") }) \ No newline at end of file diff --git a/services/users/src/providers/db.ts b/services/users/src/providers/db.ts index 19f347bc2..f8391ae06 100644 --- a/services/users/src/providers/db.ts +++ b/services/users/src/providers/db.ts @@ -6,11 +6,11 @@ import useEthers from "./ethers" const { generateNonce } = useEthers() const postgres = new Postgres({ - host: process.env.DB_HOST || "localhost", - port: parseInt(process.env.DB_PORT as string) || 5432, - database: process.env.DB_NAME || "users", - user: process.env.DB_USER || "postgres", - password: process.env.DB_PASSWORD || "password" + host: process.env.DB_HOST || "localhost", + port: parseInt(process.env.DB_PORT as string) || 5432, + database: process.env.DB_NAME || "users", + user: process.env.DB_USER || "postgres", + password: process.env.DB_PASSWORD || "password" }) interface AddOperatorOptions { @@ -21,151 +21,151 @@ interface AddOperatorOptions { export default function useDB() { - /** + /** * Add an account. * @param account - The account to add * @param createdAt - The account's creation date (optional) * @returns The new account */ - async function addAccount(account: Account, createdAt?: string) : Promise { - try { - if (!createdAt) createdAt = new Date().toISOString() - const { address, currency, userId, walletProvider } = account + async function addAccount(account: Account, createdAt?: string) : Promise { + try { + if (!createdAt) createdAt = new Date().toISOString() + const { address, currency, userId, walletProvider } = account - // Check if the account already exists for the user - const checkText = "SELECT * FROM accounts WHERE user_id = $1 AND address = $2;" - const checkParams = [userId, address] - const checkResultRows = await postgres.query(checkText, checkParams) + // Check if the account already exists for the user + const checkText = "SELECT * FROM accounts WHERE user_id = $1 AND address = $2;" + const checkParams = [userId, address] + const checkResultRows = await postgres.query(checkText, checkParams) - if (checkResultRows[0]) { - // Account with this address already exists for the user - throw new Error("Account with this address already exists for the user") - } + if (checkResultRows[0]) { + // Account with this address already exists for the user + throw new Error("Account with this address already exists for the user") + } - // Proceed to add the account - const text = "INSERT INTO accounts (address, currency, user_id, wallet_provider, created_at) VALUES ($1, $2, $3, $4, $5) RETURNING *;" - const params = [address, - currency, - userId, - walletProvider, - createdAt] - const rows = await postgres.query(text, params) - const accountAdded = rows[0] - const accountId = accountAdded.id - await addUserAccount(parseInt(userId), accountId) - return accountAdded as Account - } catch (error: any) { - throw new Error("There was an error adding the account to the database: " + error.message) - } - } + // Proceed to add the account + const text = "INSERT INTO accounts (address, currency, user_id, wallet_provider, created_at) VALUES ($1, $2, $3, $4, $5) RETURNING *;" + const params = [address, + currency, + userId, + walletProvider, + createdAt] + const rows = await postgres.query(text, params) + const accountAdded = rows[0] + const accountId = accountAdded.id + await addUserAccount(parseInt(userId), accountId) + return accountAdded as Account + } catch (error: any) { + throw new Error("There was an error adding the account to the database: " + error.message) + } + } - /** + /** * Adds operator to operator table * @param userId * @param accountId * @returns Promise */ - // TODO: Need some check to make sure operator is properly registered - async function addOperator( - { userId, accountId, nodeUrl }: AddOperatorOptions - ) : Promise { - try { - const created_at = new Date().toISOString() - const text = "INSERT INTO operators (user_id, account_id, node_url, created_at, updated_at) VALUES ($1, $2, $3, $4, $5) RETURNING *;" - const params = [userId, - accountId, - nodeUrl, - created_at, - created_at] - const rows = await postgres.query(text, params) - const addedOperator = rows[0] - return formatResult(addedOperator) - } catch (error) { - console.error(`There was an error in addOperator in useDB.ts: ${error}`) - throw new Error("There was an error adding the operator to the database") + // TODO: Need some check to make sure operator is properly registered + async function addOperator( + { userId, accountId, nodeUrl }: AddOperatorOptions + ) : Promise { + try { + const created_at = new Date().toISOString() + const text = "INSERT INTO operators (user_id, account_id, node_url, created_at, updated_at) VALUES ($1, $2, $3, $4, $5) RETURNING *;" + const params = [userId, + accountId, + nodeUrl, + created_at, + created_at] + const rows = await postgres.query(text, params) + const addedOperator = rows[0] + return formatResult(addedOperator) + } catch (error) { + console.error(`There was an error in addOperator in useDB.ts: ${error}`) + throw new Error("There was an error adding the operator to the database") + } } - } - /** + /** * Add a user. * @param user - The user to add * @param account - The user's accounts * @returns The new user */ - async function addUser(user: User, account: Account) : Promise { - const { address, createdAt, updatedAt, walletProvider } = user - const text = "INSERT INTO users (address, created_at, updated_at, wallet_provider) VALUES ($1, $2, $3, $4) RETURNING *;" - const params = [address, - createdAt, - updatedAt, - walletProvider] - const rows = await postgres.query(text, params) - const addedUser = rows[0] - account.userId = addedUser.id + async function addUser(user: User, account: Account) : Promise { + const { address, createdAt, updatedAt, walletProvider } = user + const text = "INSERT INTO users (address, created_at, updated_at, wallet_provider) VALUES ($1, $2, $3, $4) RETURNING *;" + const params = [address, + createdAt, + updatedAt, + walletProvider] + const rows = await postgres.query(text, params) + const addedUser = rows[0] + account.userId = addedUser.id - const accountAdded = await addAccount(account, createdAt) - addedUser.accounts = [accountAdded] + const accountAdded = await addAccount(account, createdAt) + addedUser.accounts = [accountAdded] - return formatResult(addedUser) - } + return formatResult(addedUser) + } - /** + /** * Add a user account. * @param user_id - The user's id * @param account_id - The account's id * @returns The new user account */ - async function addUserAccount(user_id: number, account_id: number) { - const createdAt = new Date().toISOString() - const text = "INSERT INTO user_accounts (user_id, account_id, created_at) VALUES ($1, $2, $3) RETURNING *;" - const params = [user_id, - account_id, - createdAt] - const rows = await postgres.query(text, params) - return rows[0] - } + async function addUserAccount(user_id: number, account_id: number) { + const createdAt = new Date().toISOString() + const text = "INSERT INTO user_accounts (user_id, account_id, created_at) VALUES ($1, $2, $3) RETURNING *;" + const params = [user_id, + account_id, + createdAt] + const rows = await postgres.query(text, params) + return rows[0] + } - /** + /** * Get accounts by address. * @param address - The account's address * @returns The account if found, otherwise undefined */ - async function getAccounts(address: string): Promise { - try { - const text = "SELECT * FROM accounts WHERE address = $1;" - const params = [address.toLowerCase()] - const rows = await postgres.query(text, params) - return formatResult(rows) as Account[] - } catch (error) { - throw new Error("There was an error getting accounts from the database") + async function getAccounts(address: string): Promise { + try { + const text = "SELECT * FROM accounts WHERE address = $1;" + const params = [address.toLowerCase()] + const rows = await postgres.query(text, params) + return formatResult(rows) as Account[] + } catch (error) { + throw new Error("There was an error getting accounts from the database") + } } - } - /** + /** * Get nonce by address. * @param address - The address user is using to sign in with ethereum * @returns - The nonce if address is a pk on the table or undefined */ - async function getNonce(address:string) { - try { - const text = "SELECT nonce FROM nonces WHERE address = $1;" - const params = [address] - const rows = await postgres.query(text, params) - const { nonce } = rows[0] - return formatResult(nonce) - } catch (error) { - throw new Error("There was an error getting nonce from the database") + async function getNonce(address:string) { + try { + const text = "SELECT nonce FROM nonces WHERE address = $1;" + const params = [address] + const rows = await postgres.query(text, params) + const { nonce } = rows[0] + return formatResult(nonce) + } catch (error) { + throw new Error("There was an error getting nonce from the database") + } } - } - /** + /** * Get a user by address. * @param address - The user's address * @returns The user if found, otherwise undefined */ - async function getUserByAddress(address: string): Promise { - try { - const text = ` + async function getUserByAddress(address: string): Promise { + try { + const text = ` SELECT u.*, json_agg( @@ -199,25 +199,25 @@ export default function useDB() { GROUP BY u.id ` - const params = [address] - const rows = await postgres.query(text, params) - const user = rows[0] - return formatResult(user) as UserWithAccountsAndOperators - } catch (error) { - console.log("ERROR in DB") - throw new Error("There was an error getting user from the database") + const params = [address] + const rows = await postgres.query(text, params) + const user = rows[0] + return formatResult(user) as UserWithAccountsAndOperators + } catch (error) { + console.log("ERROR in DB") + throw new Error("There was an error getting user from the database") + } } - } - /** + /** * Get a user by id. * @param id - The user's id * @returns The user if found, otherwise undefined * @throws Error if the user is not found */ - async function getUserById(id: string): Promise { - try { - const text = ` + async function getUserById(id: string): Promise { + try { + const text = ` SELECT u.*, json_agg( @@ -251,17 +251,17 @@ export default function useDB() { GROUP BY u.id ` - const params = [id] - const rows = await postgres.query(text, params) - const user = rows[0] - return formatResult(user) as UserWithAccountsAndOperators - } catch (err) { - throw new Error("There was an error getting user by id from the database") + const params = [id] + const rows = await postgres.query(text, params) + const user = rows[0] + return formatResult(user) as UserWithAccountsAndOperators + } catch (err) { + throw new Error("There was an error getting user by id from the database") + } } - } - // TODO: Does this also delete any operator associated with the address associated with this account? - /** + // TODO: Does this also delete any operator associated with the address associated with this account? + /** * Remove an account. * @param address - The account's address (pk) * @param ownerAddress - The account's owner address @@ -269,17 +269,17 @@ export default function useDB() { * @param currency - The account's currency * @returns The removed account if found, otherwise undefined */ - async function removeAccount({ address, currency, ownerAddress, walletProvider } : RemoveAccountOptions) { - const text = "DELETE FROM accounts WHERE address = $1 AND owner_address = $2 AND wallet_provider = $3 AND currency = $4 RETURNING *;" - const params = [address, - ownerAddress, - walletProvider, - currency] - const rows = await postgres.query(text, params) - return rows[0] as Account - } + async function removeAccount({ address, currency, ownerAddress, walletProvider } : RemoveAccountOptions) { + const text = "DELETE FROM accounts WHERE address = $1 AND owner_address = $2 AND wallet_provider = $3 AND currency = $4 RETURNING *;" + const params = [address, + ownerAddress, + walletProvider, + currency] + const rows = await postgres.query(text, params) + return rows[0] as Account + } - /** + /** * Update user's address based on userId. * @param userId - The user's id * @param address - The user's new address @@ -287,25 +287,25 @@ export default function useDB() { * @throws Error if the user is not found * @throws Error if the user's address is not updated */ - async function updateUserAddress(userId: number, address: string): Promise { - try { - const updated_at = new Date().toISOString() - const text = "UPDATE users SET address = $1, updated_at = $2 WHERE id = $3 RETURNING *;" - const params = [address, - updated_at, - userId] - const rows = await postgres.query(text, params) - const user = rows[0] - if (!user) throw new Error("User not found.") - if (user.address !== address) throw new Error("User address not updated.") - return user - } catch (error) { - console.error("There was an error updating the user address in updateUserAddress.", error) - throw error + async function updateUserAddress(userId: number, address: string): Promise { + try { + const updated_at = new Date().toISOString() + const text = "UPDATE users SET address = $1, updated_at = $2 WHERE id = $3 RETURNING *;" + const params = [address, + updated_at, + userId] + const rows = await postgres.query(text, params) + const user = rows[0] + if (!user) throw new Error("User not found.") + if (user.address !== address) throw new Error("User address not updated.") + return user + } catch (error) { + console.error("There was an error updating the user address in updateUserAddress.", error) + throw error + } } - } - /** + /** * Update user's agreedToTermsOfService based on userId. * @param userId - The user's id * @param agreedToTermsOfService - The user's new agreedToTermsOfService @@ -313,91 +313,91 @@ export default function useDB() { * @throws Error if the user is not found * */ - async function updateUserAgreedToTermsOfService(userId: number, agreedToTermsOfService: boolean): Promise { - try { - const updated_at = new Date().toISOString() - const text = "UPDATE users SET agreed_to_terms_of_service = $1, updated_at = $2 WHERE id = $3 RETURNING *;" - const params = [agreedToTermsOfService, - updated_at, - userId] - const rows = await postgres.query(text, params) - const user = rows[0] - if (!user) throw new Error("User not found.") - return user - } catch (error) { - console.error("There was an error updating the user agreedToTermsOfService in updateUserAgreedToTermsOfService.", error) - throw error + async function updateUserAgreedToTermsOfService(userId: number, agreedToTermsOfService: boolean): Promise { + try { + const updated_at = new Date().toISOString() + const text = "UPDATE users SET agreed_to_terms_of_service = $1, updated_at = $2 WHERE id = $3 RETURNING *;" + const params = [agreedToTermsOfService, + updated_at, + userId] + const rows = await postgres.query(text, params) + const user = rows[0] + if (!user) throw new Error("User not found.") + return user + } catch (error) { + console.error("There was an error updating the user agreedToTermsOfService in updateUserAgreedToTermsOfService.", error) + throw error + } } - } - /** + /** * Add or update nonce for an address. * @param address - The address * @returns A promise that resolves when the nonce is added or updated */ - async function upsertNonce(address: string): Promise { - try { - const nonce = generateNonce() - const text = "INSERT INTO nonces (address, nonce) VALUES ($1, $2) ON CONFLICT (address) DO UPDATE SET nonce = $2;" - const params = [address, nonce] - await postgres.query(text, params) - return nonce - } catch (error) { - throw new Error("There was an error upserting nonce in the database") + async function upsertNonce(address: string): Promise { + try { + const nonce = generateNonce() + const text = "INSERT INTO nonces (address, nonce) VALUES ($1, $2) ON CONFLICT (address) DO UPDATE SET nonce = $2;" + const params = [address, nonce] + await postgres.query(text, params) + return nonce + } catch (error) { + throw new Error("There was an error upserting nonce in the database") + } } - } - /** + /** * Format data from a database result object (convert to camelCase). * @param rows - The result date * @returns The formatted data */ - function formatResult(obj: any) : any { - if (typeof obj !== "object" || obj === null) { - // Return non-object values as is - return obj - } + function formatResult(obj: any) : any { + if (typeof obj !== "object" || obj === null) { + // Return non-object values as is + return obj + } - if (Array.isArray(obj)) { - // If obj is an array, map over each item and recursively call the function - return obj.map(item => formatResult(item)) - } + if (Array.isArray(obj)) { + // If obj is an array, map over each item and recursively call the function + return obj.map(item => formatResult(item)) + } - const convertedObj: any = {} + const convertedObj: any = {} - for (const key in obj) { - if (Object.prototype.hasOwnProperty.call(obj, key)) { - const camelCaseKey = camelCase(key) - const value = obj[key] + for (const key in obj) { + if (Object.prototype.hasOwnProperty.call(obj, key)) { + const camelCaseKey = camelCase(key) + const value = obj[key] - if (typeof value === "object" && value !== null) { - // Recursively convert nested objects - convertedObj[camelCaseKey] = formatResult(value) - } else { - // Convert key to camel case and assign the value - convertedObj[camelCaseKey] = value + if (typeof value === "object" && value !== null) { + // Recursively convert nested objects + convertedObj[camelCaseKey] = formatResult(value) + } else { + // Convert key to camel case and assign the value + convertedObj[camelCaseKey] = value + } + } } - } - } - return convertedObj - } + return convertedObj + } - return { - addAccount, - addOperator, - addUser, - formatResult, - getAccounts, - getNonce, - getUserByAddress, - getUserById, - removeAccount, - updateUserAddress, - updateUserAgreedToTermsOfService, - upsertNonce - } + return { + addAccount, + addOperator, + addUser, + formatResult, + getAccounts, + getNonce, + getUserByAddress, + getUserById, + removeAccount, + updateUserAddress, + updateUserAgreedToTermsOfService, + upsertNonce + } } \ No newline at end of file diff --git a/services/users/src/providers/ethers.ts b/services/users/src/providers/ethers.ts index ce4908bf0..dbc48cb49 100644 --- a/services/users/src/providers/ethers.ts +++ b/services/users/src/providers/ethers.ts @@ -3,41 +3,41 @@ import { LoginCredentials } from "@casimir/types" export default function useEthers() { - /** + /** * Generate nonce using EIP-4361 (Sign in with Ethereum) * * @returns {string} - The nonce * @see https://eips.ethereum.org/EIPS/eip-4361 */ - function generateNonce(length = 16): string { - let result = "" - const characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" - for (let i = 0; i < length; i++) { - result += characters.charAt(Math.floor(Math.random() * characters.length)) + function generateNonce(length = 16): string { + let result = "" + const characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" + for (let i = 0; i < length; i++) { + result += characters.charAt(Math.floor(Math.random() * characters.length)) + } + return result } - return result - } - /** + /** * Verifies a user's login attempt with an address, message and signed message * * @param {LoginCredentials} loginCredentials - The user's address, message and signed message * @returns {boolean} - The response from the login request */ - function verifyMessageSignature(loginCredentials: LoginCredentials): boolean { - const { address, message, signedMessage } = loginCredentials - try { - if (!address.length || !message.length || !signedMessage.length) { - return false - } else { - const recoveredAddress = ethers.utils.verifyMessage(message, signedMessage) - return address.toLowerCase() === recoveredAddress.toLowerCase() - } - } catch (error) { - console.log("error :>> ", error) - return false + function verifyMessageSignature(loginCredentials: LoginCredentials): boolean { + const { address, message, signedMessage } = loginCredentials + try { + if (!address.length || !message.length || !signedMessage.length) { + return false + } else { + const recoveredAddress = ethers.utils.verifyMessage(message, signedMessage) + return address.toLowerCase() === recoveredAddress.toLowerCase() + } + } catch (error) { + console.log("error :>> ", error) + return false + } } - } - return { generateNonce, verifyMessageSignature } + return { generateNonce, verifyMessageSignature } } diff --git a/services/users/src/providers/postgres.ts b/services/users/src/providers/postgres.ts index eea730f23..62a0285b2 100644 --- a/services/users/src/providers/postgres.ts +++ b/services/users/src/providers/postgres.ts @@ -4,17 +4,17 @@ import { Pool, PoolConfig } from "pg" * Postgres database provider with pool client auto-connect-and-release */ export class Postgres { - /** Postgres connection pool */ - private pool: Pool + /** Postgres connection pool */ + private pool: Pool - /** + /** * Create a new Postgres database provider */ - constructor(poolConfig: PoolConfig) { - this.pool = new Pool(poolConfig) - } + constructor(poolConfig: PoolConfig) { + this.pool = new Pool(poolConfig) + } - /** + /** * Query the database * @param text SQL query * @param params Query parameters @@ -26,11 +26,11 @@ export class Postgres { * if (rows.length) console.log(rows[0].text) // Hello world! * ``` */ - async query(text: string, params: any[] = []) { - const client = await this.pool.connect() - const res = await client.query(text, params) - client.release() - const { rows } = res - return rows - } + async query(text: string, params: any[] = []) { + const client = await this.pool.connect() + const res = await client.query(text, params) + client.release() + const { rows } = res + return rows + } } \ No newline at end of file diff --git a/services/users/src/routes/analytics.ts b/services/users/src/routes/analytics.ts index fedf4c32c..441df14ec 100644 --- a/services/users/src/routes/analytics.ts +++ b/services/users/src/routes/analytics.ts @@ -10,34 +10,34 @@ const router = express.Router() const { formatResult, getUserById } = useDB() router.get("/", verifySession(), async (req: SessionRequest, res: express.Response) => { - try { - console.log("got to athena route") - // Two tables - // Events - // any events on the blockchain (including the block itself) - // so all txs + 1 for block - // Athena currently has all of this Goerli tx data - // Actions <-- this is the one we want for Overview Chart - // contract data (StakeDeposited, Withdrawal, etc.) - // includes tx data (outgoing, incoming, etc.) - const id = req.session?.getUserId() as string - const userId = id.toString() - const user = await getUserById(userId) - const { accounts } = user as UserWithAccountsAndOperators - const addresses = accounts.map((account) => account.address) - const database = "casimir_analytics_database_dev" - const athenaTable = "casimir_analytics_action_table_dev1" - const opt = { - profile: process.env.AWS_PROFILE as string, - database, - // output: 's3://casimir-analytics-wallet-bucket-dev1/', - output: "s3://casimir-analytics-action-bucket-dev1/", - workgroup: "primary", - catalog: "AwsDataCatalog", - backoff: 1000, - region: "us-east-2", - } - /** + try { + console.log("got to athena route") + // Two tables + // Events + // any events on the blockchain (including the block itself) + // so all txs + 1 for block + // Athena currently has all of this Goerli tx data + // Actions <-- this is the one we want for Overview Chart + // contract data (StakeDeposited, Withdrawal, etc.) + // includes tx data (outgoing, incoming, etc.) + const id = req.session?.getUserId() as string + const userId = id.toString() + const user = await getUserById(userId) + const { accounts } = user as UserWithAccountsAndOperators + const addresses = accounts.map((account) => account.address) + const database = "casimir_analytics_database_dev" + const athenaTable = "casimir_analytics_action_table_dev1" + const opt = { + profile: process.env.AWS_PROFILE as string, + database, + // output: 's3://casimir-analytics-wallet-bucket-dev1/', + output: "s3://casimir-analytics-action-bucket-dev1/", + workgroup: "primary", + catalog: "AwsDataCatalog", + backoff: 1000, + region: "us-east-2", + } + /** * Can query the following properties: * wallet_address * wallet_balance @@ -48,44 +48,44 @@ router.get("/", verifySession(), async (req: SessionRequest, res: express.Respon * price * gas_fee */ - // TODO: Include type in WHERE to decrease query time - // const testStmt = 'SELECT * FROM "casimir_analytics_action_table_dev1" limit 10;' - // const stmt = ` - // SELECT * FROM ${database}.${athenaTable} - // WHERE address IN (${addresses.map((address: string) => `'${address}'`).join(',')}) - // ORDER BY received_at DESC - // LIMIT 100; - // ` - // const { rows } = await query(testStmt, opt) - // console.log('rows :>> ', rows) - console.log("addresses :>> ", addresses) - const stmt = `SELECT * FROM "casimir_analytics_database_dev"."casimir_analytics_action_table_dev1" + // TODO: Include type in WHERE to decrease query time + // const testStmt = 'SELECT * FROM "casimir_analytics_action_table_dev1" limit 10;' + // const stmt = ` + // SELECT * FROM ${database}.${athenaTable} + // WHERE address IN (${addresses.map((address: string) => `'${address}'`).join(',')}) + // ORDER BY received_at DESC + // LIMIT 100; + // ` + // const { rows } = await query(testStmt, opt) + // console.log('rows :>> ', rows) + console.log("addresses :>> ", addresses) + const stmt = `SELECT * FROM "casimir_analytics_database_dev"."casimir_analytics_action_table_dev1" WHERE "address" IN (${addresses.map((address: string) => `'${address}'`).join(",")}) ORDER BY received_at DESC LIMIT 100;` - const [columns, rows ] = await query(stmt, { - database: "casimir_analytics_database_dev", - workgroup: "primary", - profile: "consensus-networks-dev", - output: "s3://cms-lds-agg/cms_hcf_aggregates/", - catalog: "AwsDataCatalog", - backoff: 1000, - region: "us-east-2", - }) - const data = formatResult(rows) - console.log("data :>> ", data) - res.status(200).json({ - error: false, - message: "Analytics data successfully fetched.", - data - }) - } catch (err) { - console.error("err :>> ", err) - res.status(500).json({ - error: true, - message: "Server error." - }) - } + const [columns, rows ] = await query(stmt, { + database: "casimir_analytics_database_dev", + workgroup: "primary", + profile: "consensus-networks-dev", + output: "s3://cms-lds-agg/cms_hcf_aggregates/", + catalog: "AwsDataCatalog", + backoff: 1000, + region: "us-east-2", + }) + const data = formatResult(rows) + console.log("data :>> ", data) + res.status(200).json({ + error: false, + message: "Analytics data successfully fetched.", + data + }) + } catch (err) { + console.error("err :>> ", err) + res.status(500).json({ + error: true, + message: "Server error." + }) + } }) export default router \ No newline at end of file diff --git a/services/users/src/routes/auth.ts b/services/users/src/routes/auth.ts index b1e01af38..90339f262 100644 --- a/services/users/src/routes/auth.ts +++ b/services/users/src/routes/auth.ts @@ -11,132 +11,132 @@ const { addUser, getNonce, getUserByAddress, upsertNonce } = useDB() const router = express.Router() router.post("/nonce", async (req: express.Request, res: express.Response) => { - try { - const { address } = req.body - const nonce = await upsertNonce(address) - if (nonce) { - res.setHeader("Content-Type", "text/plain") - res.status(200) - res.json({ - error: false, - message: "Nonce retrieved", - data: nonce - }) + try { + const { address } = req.body + const nonce = await upsertNonce(address) + if (nonce) { + res.setHeader("Content-Type", "text/plain") + res.status(200) + res.json({ + error: false, + message: "Nonce retrieved", + data: nonce + }) + } + } catch (error: any) { + res.status(500) + res.json({ + error: true, + message: error.message || "Error getting nonce" + }) } - } catch (error: any) { - res.status(500) - res.json({ - error: true, - message: error.message || "Error getting nonce" - }) - } }) router.post("/login", async (req: express.Request, res: express.Response) => { - try { - const { body } = req - const loginCredentials = body - const { provider, address, currency, message, signedMessage } = loginCredentials - const { parsedDomain, parsedNonce } = parseMessage(message) - const verifyDomain = parsedDomain ? verifyMessageDomain(parsedDomain) : false - const verifyNonce = parsedNonce ? await verifyMessageNonce(address, parsedNonce) : false - const verifySignature = verifyMessageSignature(loginCredentials) - const verificationError = !verifyDomain ? "domain" : !verifyNonce ? "nonce" : !verifySignature ? "signature" : false - if (verificationError) { - return res.status(422).json({ - error: true, - message: `Invalid ${verificationError}.`, - }) - } else { - const user = await getUserByAddress(address) - if (!user) { // signup - console.log("SIGNING UP!") - const now = new Date().toISOString() - const newUser = { - address, - createdAt: now, - updatedAt: now, - walletProvider: provider, - } as User - const account = { - address, - currency, - walletProvider: provider, - } as Account - - const addUserResult = await addUser(newUser, account) - if (addUserResult?.address !== address) { - res.setHeader("Content-Type", "application/json") - res.status(500) - res.json({ - error: true, - message: "Problem creating new user", - }) + try { + const { body } = req + const loginCredentials = body + const { provider, address, currency, message, signedMessage } = loginCredentials + const { parsedDomain, parsedNonce } = parseMessage(message) + const verifyDomain = parsedDomain ? verifyMessageDomain(parsedDomain) : false + const verifyNonce = parsedNonce ? await verifyMessageNonce(address, parsedNonce) : false + const verifySignature = verifyMessageSignature(loginCredentials) + const verificationError = !verifyDomain ? "domain" : !verifyNonce ? "nonce" : !verifySignature ? "signature" : false + if (verificationError) { + return res.status(422).json({ + error: true, + message: `Invalid ${verificationError}.`, + }) } else { - const id = addUserResult?.id.toString() as string - await Session.createNewSession(req, res, id) - res.setHeader("Content-Type", "application/json") - res.status(200) - res.json({ - error: false, - message: "Sign Up Successful" - }) + const user = await getUserByAddress(address) + if (!user) { // signup + console.log("SIGNING UP!") + const now = new Date().toISOString() + const newUser = { + address, + createdAt: now, + updatedAt: now, + walletProvider: provider, + } as User + const account = { + address, + currency, + walletProvider: provider, + } as Account + + const addUserResult = await addUser(newUser, account) + if (addUserResult?.address !== address) { + res.setHeader("Content-Type", "application/json") + res.status(500) + res.json({ + error: true, + message: "Problem creating new user", + }) + } else { + const id = addUserResult?.id.toString() as string + await Session.createNewSession(req, res, id) + res.setHeader("Content-Type", "application/json") + res.status(200) + res.json({ + error: false, + message: "Sign Up Successful" + }) + } + } else { // login + console.log("LOGGING IN!") + const response = verifyMessageSignature({ address, currency, message, signedMessage, provider }) + upsertNonce(address) + const user = await getUserByAddress(address) + const userId = user?.id.toString() as string + response ? await Session.createNewSession(req, res, userId) : null + res.setHeader("Content-Type", "application/json") + res.status(200) + res.json({ + error: false, + message: response ? "Login successful" : "Login failed", + }) + } } - } else { // login - console.log("LOGGING IN!") - const response = verifyMessageSignature({ address, currency, message, signedMessage, provider }) - upsertNonce(address) - const user = await getUserByAddress(address) - const userId = user?.id.toString() as string - response ? await Session.createNewSession(req, res, userId) : null - res.setHeader("Content-Type", "application/json") - res.status(200) + } catch (error: any) { + console.log("error in /login :>> ", error) + res.status(500) res.json({ - error: false, - message: response ? "Login successful" : "Login failed", + error: true, + message: error.message || "Error logging in" }) - } } - } catch (error: any) { - console.log("error in /login :>> ", error) - res.status(500) - res.json({ - error: true, - message: error.message || "Error logging in" - }) - } }) function parseDomain(msg: string) { - const uri = msg.split("URI:")[1].split("Version:")[0].trim() - const parsedUri = uri.split("://")[1].split("/")[0] - const domain = msg.split("wants you to sign in with your Ethereum account:")[0].trim() - return domain === parsedUri ? domain : null + const uri = msg.split("URI:")[1].split("Version:")[0].trim() + const parsedUri = uri.split("://")[1].split("/")[0] + const domain = msg.split("wants you to sign in with your Ethereum account:")[0].trim() + return domain === parsedUri ? domain : null } function parseMessage(msg: string) { - const parsedDomain = parseDomain(msg) - const parsedNonce = parseNonce(msg) - return { parsedDomain, parsedNonce } + const parsedDomain = parseDomain(msg) + const parsedNonce = parseNonce(msg) + return { parsedDomain, parsedNonce } } function parseNonce(msg: string) { - return msg.split("Nonce:")[1].split("Issued At:")[0].trim() + return msg.split("Nonce:")[1].split("Issued At:")[0].trim() } function verifyMessageDomain(domain: string): boolean { - const url = domain.includes("localhost") ? `http://${domain}` : `https://${domain}` - if (process.env.WEB_URL) return url === process.env.WEB_URL - return url === "http://localhost:3001" + const url = domain.includes("localhost") ? `http://${domain}` : `https://${domain}` + if (process.env.WEB_URL) return url === process.env.WEB_URL + return url === "http://localhost:3001" } async function verifyMessageNonce(address: string, msgNonce: string) : Promise { - try { - const dbNonce = await getNonce(address) - return msgNonce === dbNonce - } catch (error) { - throw new Error("Problem verifying message nonce") - } + try { + const dbNonce = await getNonce(address) + return msgNonce === dbNonce + } catch (error) { + throw new Error("Problem verifying message nonce") + } } export default router \ No newline at end of file diff --git a/services/users/src/routes/health.ts b/services/users/src/routes/health.ts index 3bb2ee358..d1fa2f4ed 100644 --- a/services/users/src/routes/health.ts +++ b/services/users/src/routes/health.ts @@ -3,7 +3,7 @@ import express from "express" const router = express.Router() router.get("/", (_req, res) => { - res.status(200).send("OK") + res.status(200).send("OK") }) export default router \ No newline at end of file diff --git a/services/users/src/routes/user.ts b/services/users/src/routes/user.ts index 95169e6f5..b90619fd7 100644 --- a/services/users/src/routes/user.ts +++ b/services/users/src/routes/user.ts @@ -6,263 +6,263 @@ import { UserWithAccountsAndOperators } from "@casimir/types" const router = express.Router() const { - addAccount, - addOperator, - getAccounts, - getUserByAddress, - getUserById, - updateUserAddress, - updateUserAgreedToTermsOfService, - removeAccount + addAccount, + addOperator, + getAccounts, + getUserByAddress, + getUserById, + updateUserAddress, + updateUserAgreedToTermsOfService, + removeAccount } = useDB() router.get("/", verifySession(), async (req: SessionRequest, res: express.Response) => { - try { - const id = req.session?.getUserId() as string - const user = await getUserById(id) - const message = user ? "User found" : "User not found" - res.setHeader("Content-Type", "application/json") - res.status(200) - res.json({ - message, - error: false, - user - }) - } catch (err) { - res.status(500) - res.json({ - message: "Error getting user", - error: true, - user: null - }) - } + try { + const id = req.session?.getUserId() as string + const user = await getUserById(id) + const message = user ? "User found" : "User not found" + res.setHeader("Content-Type", "application/json") + res.status(200) + res.json({ + message, + error: false, + user + }) + } catch (err) { + res.status(500) + res.json({ + message: "Error getting user", + error: true, + user: null + }) + } }) router.post("/add-sub-account", verifySession(), async (req: SessionRequest, res: express.Response) => { - try { - console.log("ADDING ACCOUNT!") - const { account, id } = req.body - const { ownerAddress } = account - const userId = id.toString() - const userSessionId = req.session?.getUserId() - const validatedUserId = validateUserId(userSessionId, userId) - console.log("validatedUserId :>> ", validatedUserId) - if (!validatedUserId) { - res.setHeader("Content-Type", "application/json") - res.status(200) - res.json({ - message: "Address does not match session", - error: true, - data: null - }) + try { + console.log("ADDING ACCOUNT!") + const { account, id } = req.body + const { ownerAddress } = account + const userId = id.toString() + const userSessionId = req.session?.getUserId() + const validatedUserId = validateUserId(userSessionId, userId) + console.log("validatedUserId :>> ", validatedUserId) + if (!validatedUserId) { + res.setHeader("Content-Type", "application/json") + res.status(200) + res.json({ + message: "Address does not match session", + error: true, + data: null + }) + } + await addAccount(account) + const user = await getUserByAddress(ownerAddress) + res.setHeader("Content-Type", "application/json") + res.status(200) + res.json({ + message: "Account added", + error: false, + data: user + }) + } catch (err) { + res.status(500) + res.json({ + message: "Error adding account", + error: true, + data: null + }) } - await addAccount(account) - const user = await getUserByAddress(ownerAddress) - res.setHeader("Content-Type", "application/json") - res.status(200) - res.json({ - message: "Account added", - error: false, - data: user - }) - } catch (err) { - res.status(500) - res.json({ - message: "Error adding account", - error: true, - data: null - }) - } }) router.post("/add-operator", verifySession(), async (req: SessionRequest, res: express.Response) => { - try { - console.log("ADDING OPERATOR!") - const { address, nodeUrl } = req.body - const userId = parseInt(req.session?.getUserId() as string) - const accounts = await getAccounts(address) - const userAccount = accounts.find(account => parseInt(account.userId) === userId) - const accountId = userAccount?.id as number - await addOperator({ accountId, nodeUrl, userId }) - res.setHeader("Content-Type", "application/json") - res.status(200) - res.json({ - message: "Operator added", - error: false - }) - } catch (err) { - res.status(500) - res.json({ - message: "Error adding operator", - error: true - }) - } + try { + console.log("ADDING OPERATOR!") + const { address, nodeUrl } = req.body + const userId = parseInt(req.session?.getUserId() as string) + const accounts = await getAccounts(address) + const userAccount = accounts.find(account => parseInt(account.userId) === userId) + const accountId = userAccount?.id as number + await addOperator({ accountId, nodeUrl, userId }) + res.setHeader("Content-Type", "application/json") + res.status(200) + res.json({ + message: "Operator added", + error: false + }) + } catch (err) { + res.status(500) + res.json({ + message: "Error adding operator", + error: true + }) + } }) router.get("/check-if-primary-address-exists/:address", async (req: express.Request, res: express.Response) => { - try { - const { params } = req - const { address } = params - const user = await getUserByAddress(address) - console.log("user in check-if-primary-.....:>> ", user) - const userAddress = user?.address - const userProvider = user?.walletProvider - const sameAddress = userAddress === address - res.setHeader("Content-Type", "application/json") - res.status(200) - res.json({ - error: false, - message: "Successfully checked if primary address exists", - data: { - sameAddress, - walletProvider: userProvider - } - }) - } catch (error: any) { - const { message } = error - res.setHeader("Content-Type", "application/json") - res.status(500) - res.json({ - error: true, - message: message || "Problem checking if primary address exists" - }) - } + try { + const { params } = req + const { address } = params + const user = await getUserByAddress(address) + console.log("user in check-if-primary-.....:>> ", user) + const userAddress = user?.address + const userProvider = user?.walletProvider + const sameAddress = userAddress === address + res.setHeader("Content-Type", "application/json") + res.status(200) + res.json({ + error: false, + message: "Successfully checked if primary address exists", + data: { + sameAddress, + walletProvider: userProvider + } + }) + } catch (error: any) { + const { message } = error + res.setHeader("Content-Type", "application/json") + res.status(500) + res.json({ + error: true, + message: message || "Problem checking if primary address exists" + }) + } }) router.get("/check-secondary-address/:address", async (req: express.Request, res: express.Response) => { - try { - const { params } = req - const { address } = params - const accounts = await getAccounts(address) - const users = await Promise.all(accounts.map(async account => { - const { userId } = account - const user = await getUserById(userId) - const { address, walletProvider } = user as UserWithAccountsAndOperators - return { - address: maskAddress(address), - walletProvider, - } - })) - res.setHeader("Content-Type", "application/json") - res.status(200) - res.json({ - error: false, - message: "Successfully checked secondary address", - data: users - }) - } catch (error: any) { - console.log("error in /check-secondary-address :>> ", error) - res.setHeader("Content-Type", "application/json") - res.status(500) - res.json({ - error: true, - message: error.message || "Problem checking secondary address" - }) - } + try { + const { params } = req + const { address } = params + const accounts = await getAccounts(address) + const users = await Promise.all(accounts.map(async account => { + const { userId } = account + const user = await getUserById(userId) + const { address, walletProvider } = user as UserWithAccountsAndOperators + return { + address: maskAddress(address), + walletProvider, + } + })) + res.setHeader("Content-Type", "application/json") + res.status(200) + res.json({ + error: false, + message: "Successfully checked secondary address", + data: users + }) + } catch (error: any) { + console.log("error in /check-secondary-address :>> ", error) + res.setHeader("Content-Type", "application/json") + res.status(500) + res.json({ + error: true, + message: error.message || "Problem checking secondary address" + }) + } }) router.post("/remove-sub-account", verifySession(), async (req: SessionRequest, res: express.Response) => { - try { - console.log("REMOVING ACCOUNT!") - const { address, currency, id, ownerAddress, walletProvider } = req.body - const userId = id.toString() - const userSessionId = req.session?.getUserId() - const validatedAddress = validateUserId(userSessionId, userId) - if (!validatedAddress) { - res.setHeader("Content-Type", "application/json") - res.status(200) - res.json({ - message: "Address does not match session", - error: true, - data: null - }) - return - } - const accountRemoved = await removeAccount({ address, currency, ownerAddress, walletProvider }) - const user = await getUserByAddress(ownerAddress) + try { + console.log("REMOVING ACCOUNT!") + const { address, currency, id, ownerAddress, walletProvider } = req.body + const userId = id.toString() + const userSessionId = req.session?.getUserId() + const validatedAddress = validateUserId(userSessionId, userId) + if (!validatedAddress) { + res.setHeader("Content-Type", "application/json") + res.status(200) + res.json({ + message: "Address does not match session", + error: true, + data: null + }) + return + } + const accountRemoved = await removeAccount({ address, currency, ownerAddress, walletProvider }) + const user = await getUserByAddress(ownerAddress) - if (accountRemoved) { - res.setHeader("Content-Type", "application/json") - res.status(200) - res.json({ - message: "Account removed", - error: false, - data: user - }) - } else { - res.setHeader("Content-Type", "application/json") - res.status(200) - res.json({ - message: "Account not found", - error: true, - data: user - }) + if (accountRemoved) { + res.setHeader("Content-Type", "application/json") + res.status(200) + res.json({ + message: "Account removed", + error: false, + data: user + }) + } else { + res.setHeader("Content-Type", "application/json") + res.status(200) + res.json({ + message: "Account not found", + error: true, + data: user + }) + } + } catch (err) { + console.log("err :>> ", err) + res.status(500) + res.json({ + message: "Error adding account", + error: true + }) } - } catch (err) { - console.log("err :>> ", err) - res.status(500) - res.json({ - message: "Error adding account", - error: true - }) - } }) // TODO: Think through handling changing primary address with SuperTokens Sessions. router.put("/update-primary-account", verifySession(), async (req: SessionRequest, res: express.Response) => { - const { userId } = req.body - let { updatedAddress } = req.body - updatedAddress = updatedAddress.toLowerCase() + const { userId } = req.body + let { updatedAddress } = req.body + updatedAddress = updatedAddress.toLowerCase() - const user = await updateUserAddress(userId, updatedAddress) - if (!user) { - res.setHeader("Content-Type", "application/json") - res.status(200) - res.json({ - message: "User not found", - error: true, - data: null - }) - } else { - res.setHeader("Content-Type", "application/json") - res.status(200) - res.json({ - message: "Primary account updated", - error: false, - data: user - }) - } + const user = await updateUserAddress(userId, updatedAddress) + if (!user) { + res.setHeader("Content-Type", "application/json") + res.status(200) + res.json({ + message: "User not found", + error: true, + data: null + }) + } else { + res.setHeader("Content-Type", "application/json") + res.status(200) + res.json({ + message: "Primary account updated", + error: false, + data: user + }) + } }) router.put("/update-user-agreement/:userId", verifySession(), async (req: SessionRequest, res: express.Response) => { - try { - const { agreed } = req.body - const { userId } = req.params - const userID = parseInt(userId) - const user = await updateUserAgreedToTermsOfService(userID, agreed) - res.setHeader("Content-Type", "application/json") - res.status(200) - res.json({ - message: "User agreement updated", - error: false, - data: user - }) - } catch (err) { - res.status(500) - res.json({ - message: "Error updating user agreement", - error: true, - data: null - }) - } + try { + const { agreed } = req.body + const { userId } = req.params + const userID = parseInt(userId) + const user = await updateUserAgreedToTermsOfService(userID, agreed) + res.setHeader("Content-Type", "application/json") + res.status(200) + res.json({ + message: "User agreement updated", + error: false, + data: user + }) + } catch (err) { + res.status(500) + res.json({ + message: "Error updating user agreement", + error: true, + data: null + }) + } }) function maskAddress(address: string) { - return address.slice(0, 6) + "..." + address.slice(-4) + return address.slice(0, 6) + "..." + address.slice(-4) } function validateUserId(userSessionId:string | undefined, userId:string) { - return userSessionId === userId + return userSessionId === userId } export default router \ No newline at end of file diff --git a/services/users/src/sessions.config.ts b/services/users/src/sessions.config.ts index 0289e6690..6a49efbf2 100644 --- a/services/users/src/sessions.config.ts +++ b/services/users/src/sessions.config.ts @@ -2,18 +2,18 @@ import Session from "supertokens-node/recipe/session" import { TypeInput } from "supertokens-node/types" export const SuperTokensBackendConfig: TypeInput = { - framework: "express", - supertokens: { + framework: "express", + supertokens: { // SuperTokens core (temporary) host - connectionURI: process.env.SESSIONS_HOST || "https://try.supertokens.com", - apiKey: process.env.SESSIONS_KEY || "" - }, - appInfo: { - appName: process.env.PROJECT || "casimir", - apiDomain: process.env.USERS_URL || "http://localhost:4000", - websiteDomain: process.env.WEB_URL || "http://localhost:3001" - }, - recipeList: [ - Session.init(), - ] + connectionURI: process.env.SESSIONS_HOST || "https://try.supertokens.com", + apiKey: process.env.SESSIONS_KEY || "" + }, + appInfo: { + appName: process.env.PROJECT || "casimir", + apiDomain: process.env.USERS_URL || "http://localhost:4000", + websiteDomain: process.env.WEB_URL || "http://localhost:3001" + }, + recipeList: [ + Session.init(), + ] } From 32065b750cff07da0d502e6ee79b7da9c29e0de2 Mon Sep 17 00:00:00 2001 From: Christopher Cali Date: Mon, 6 Nov 2023 18:48:01 -0500 Subject: [PATCH 6/7] Refresh breakdown metrics on addAccount --- apps/web/src/composables/breakdownMetrics.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/web/src/composables/breakdownMetrics.ts b/apps/web/src/composables/breakdownMetrics.ts index 0a9b7213a..766114d7f 100644 --- a/apps/web/src/composables/breakdownMetrics.ts +++ b/apps/web/src/composables/breakdownMetrics.ts @@ -30,6 +30,10 @@ export default function useBreakdownMetrics() { watch(user, async () => { if (user.value) initializeBreakdownMetricsComposable() else uninitializeBreakdownMetricsComposable() + + if (user) { + await refreshBreakdown() + } }) const currentStaked = ref({ From c78faabfe7b3ae46768319316e8c78f45e81285b Mon Sep 17 00:00:00 2001 From: Christopher Cali Date: Mon, 6 Nov 2023 18:48:39 -0500 Subject: [PATCH 7/7] Small refactor --- apps/web/src/composables/breakdownMetrics.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/web/src/composables/breakdownMetrics.ts b/apps/web/src/composables/breakdownMetrics.ts index 766114d7f..e689016d7 100644 --- a/apps/web/src/composables/breakdownMetrics.ts +++ b/apps/web/src/composables/breakdownMetrics.ts @@ -28,12 +28,13 @@ export default function useBreakdownMetrics() { }) watch(user, async () => { - if (user.value) initializeBreakdownMetricsComposable() - else uninitializeBreakdownMetricsComposable() - - if (user) { + if (user.value) { + initializeBreakdownMetricsComposable() await refreshBreakdown() + } else { + uninitializeBreakdownMetricsComposable() } + }) const currentStaked = ref({