Merge remote-tracking branch 'origin/main' into pr-340-work

Author: KillariDev

.dockerignore

@@ -0,0 +1,27 @@
+.git
+.github
+.tsbuildinfo
+coverage
+node_modules
+**/node_modules
+shared/js
+solidity/artifacts
+solidity/coverage
+solidity/js
+solidity/ts/**/*.d.ts
+solidity/ts/**/*.d.ts.map
+solidity/ts/**/*.js
+solidity/ts/**/*.js.map
+solidity/ts/types/contractArtifact.ts
+solidity/types/contractArtifact.ts
+ui/dist
+ui/js
+ui/vendor
+ui/ts/**/*.d.ts
+ui/ts/**/*.d.ts.map
+ui/ts/**/*.js
+ui/ts/**/*.js.map
+ui/ts/abis.ts
+ui/ts/contractArtifact.ts
+ui/ts/deploymentArtifacts.ts
+ui/ts/deploymentsArtifacts.ts

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  BUN_VERSION: 1.3.11
+  BUN_VERSION: 1.3.13
   FOUNDRY_VERSION: v1.5.1
 
 jobs:

.github/workflows/ipfs-deploy.yml

@@ -1,85 +1,97 @@
 name: Build and Push to IPFS
 
 on:
+  workflow_run:
+    workflows: [CI Gate]
+    branches: [main]
+    types: [completed]
   push:
-    # Publish `master` as Docker `latest` image.
-    branches:
-      - main
-
-    # Publish `v1.2.3` tags as releases.
     tags:
       - v*
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  packages: write
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_sha || github.ref }}
+  cancel-in-progress: true
 
-# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
 env:
+  BUN_VERSION: 1.3.13
   REGISTRY: ghcr.io
 
 jobs:
-  # Push image to GitHub Packages.
-  # See also https://docs.docker.com/docker-hub/builds/
-  push:
+  publish:
+    name: Publish IPFS Image
     runs-on: ubuntu-latest
-    if: github.event_name == 'push'
+    if: github.event_name != 'workflow_run' || (github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'push' && github.event.workflow_run.head_branch == 'main')
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v7
+        with:
+          ref: ${{ github.event.workflow_run.head_sha || github.ref }}
 
-      - name: Set IMAGE_TAG
-        run: echo "IMAGE_TAG=$(echo ${{ github.repository }} | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: ${{ env.BUN_VERSION }}
 
-      - name: Build image
+      - name: Install dependencies
+        run: |
+          bun install --frozen-lockfile
+          (cd ui && bun install --frozen-lockfile)
+          (cd solidity && bun install --frozen-lockfile)
+
+      - name: Validate production build
+        run: bun run ui:build:prod
+
+      - name: Set image metadata
         run: |
-          docker build . --file ui/Dockerfile --tag $IMAGE_TAG
+          IMAGE_NAME="${REGISTRY}/$(echo "${GITHUB_REPOSITORY}" | tr '[:upper:]' '[:lower:]')"
+          if [[ "${GITHUB_EVENT_NAME}" == "workflow_run" || "${GITHUB_REF_NAME}" == "main" ]]; then
+            VERSION="latest"
+          else
+            VERSION="${GITHUB_REF_NAME#v}"
+          fi
+          echo "IMAGE_NAME=${IMAGE_NAME}" >> "$GITHUB_ENV"
+          echo "IMAGE_VERSION=${VERSION}" >> "$GITHUB_ENV"
+          echo "IMAGE_RELEASE_ID=${IMAGE_NAME}:${VERSION}" >> "$GITHUB_ENV"
+
+      - name: Build image
+        run: docker build . --file ui/Dockerfile --build-arg BUN_VERSION="${BUN_VERSION}" --tag "${IMAGE_RELEASE_ID}"
 
-      # Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
       - name: Log in to the Container registry
-        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        uses: docker/login-action@v4
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Push image
-        run: |
-          IMAGE_ID=ghcr.io/$IMAGE_TAG
-
-          # Strip git ref prefix from version
-          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-
-          # Strip "v" prefix from tag name
-          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-
-          # Use Docker `latest` tag convention
-          [ "$VERSION" == "master" ] && VERSION=latest
-
-          echo IMAGE_ID=$IMAGE_ID
-          echo VERSION=$VERSION
-
-          docker tag $IMAGE_TAG $IMAGE_ID:$VERSION
-          docker push $IMAGE_ID:$VERSION
-
-          # Make image reference available to subsequent steps
-          echo "IMAGE_RELEASE_ID=$(echo $IMAGE_ID:$VERSION)" >> $GITHUB_ENV
+        run: docker push "${IMAGE_RELEASE_ID}"
 
       - name: Create a reference for IPFS hash
         if: github.ref_type == 'tag'
         run: |
-          echo "IPFS_HASH=$(docker run --entrypoint /bin/sh $IMAGE_RELEASE_ID -c 'cat /ipfs_hash.txt')" >> $GITHUB_ENV
+          IPFS_HASH=$(docker run --entrypoint /bin/sh "${IMAGE_RELEASE_ID}" -c 'cat /ipfs_hash.txt')
+          echo "IPFS_HASH=${IPFS_HASH}" >> "$GITHUB_ENV"
 
       - name: Create a release
         if: github.ref_type == 'tag'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          # Markdown template for the release notes
           RELEASE_NOTE_TEMPLATE=$(cat << EOF
           #### IPFS Hash
 
           \`\`\`
           $IPFS_HASH
           \`\`\`
 
-          You can view published versions of Rep Crowdsourcer through any IPFS Gateway
+          You can view published versions of Zoltar through any IPFS gateway.
 
           [ipfs://$IPFS_HASH](ipfs://$IPFS_HASH) __(Recommended)__
           _requires Brave Browser or IPFS Desktop_
@@ -90,7 +102,6 @@ jobs:
           EOF
           )
 
-          # Generate payload for creating a new release
           PAYLOAD_TEMPLATE=$(cat <<EOF
           {
             "name": "$GITHUB_REF_NAME",
@@ -102,8 +113,6 @@ jobs:
           EOF
           )
 
-          # Create a github release
-          # https://docs.github.com/en/rest/releases/releases?apiVersion=2022-11-28#create-a-release
           REQUEST_DATA=$(echo "$PAYLOAD_TEMPLATE" | jq -c)
           RESPONSE=$(curl \
             --silent \
@@ -117,12 +126,10 @@ jobs:
             "https://api.github.com/repos/$GITHUB_REPOSITORY/releases"
           )
 
-          # Extract the response body and the appended http code
           RESPONSE_CODE=${RESPONSE: -3}
           RESPONSE_BODY=${RESPONSE//$RESPONSE_CODE/}
 
-          # Successful creation will return a status 201 (Created), otherwise show the error
-          if [ "$RESPONSE_CODE" -ne  201 ]; then
+          if [ "$RESPONSE_CODE" -ne 201 ]; then
             ERROR_MESSAGE=$(echo "$RESPONSE_BODY" | jq '.message')
             echo "HTTP $RESPONSE_CODE - $ERROR_MESSAGE"
             exit 1

docs/mainnet-deployment-addresses.json

@@ -13,7 +13,7 @@
 		{
 			"id": "deploymentStatusOracle",
 			"label": "Deployment Status Oracle",
-			"address": "0x138aa911c7E0d63DD3C81e4675EC8A08883728b3"
+			"address": "0xD262Bb8bBa927dD08a3fd3d6adcbAB9660B5F2e5"
 		},
 		{
 			"id": "multicall3",
@@ -23,7 +23,7 @@
 		{
 			"id": "uniformPriceDualCapBatchAuctionFactory",
 			"label": "UniformPriceDualCapBatchAuctionFactory",
-			"address": "0x47A117D404C31b5CFF82883D40c0610404D26a60"
+			"address": "0xbA605970da511b08539bcC4F77B54CF1Cd72783c"
 		},
 		{
 			"id": "scalarOutcomes",
@@ -33,7 +33,7 @@
 		{
 			"id": "securityPoolUtils",
 			"label": "SecurityPoolUtils",
-			"address": "0x9E90338b17E1Fea80Cd356607EbB6eC46653fB24"
+			"address": "0x04349f6A0302F32f8c87bb8555648AD77634343C"
 		},
 		{
 			"id": "openOracle",
@@ -53,27 +53,27 @@
 		{
 			"id": "shareTokenFactory",
 			"label": "ShareTokenFactory",
-			"address": "0x253d011F3A0f46096A4756a439543E9Dab36AA23"
+			"address": "0x95fB9708d8e54e057d2bdf027D6C43B586Ca898F"
 		},
 		{
 			"id": "priceOracleManagerAndOperatorQueuerFactory",
 			"label": "Price Oracle Manager Factory",
-			"address": "0x38d22Ec4282621eeeBE4EBFf04E08b893dC020FF"
+			"address": "0xAA71aD70f8bed84f0fd57D711f21fae8D6310354"
 		},
 		{
 			"id": "securityPoolForker",
 			"label": "Security Pool Forker",
-			"address": "0x290BF23Dd1912AdEDBdfd7419b85605C66e3d24B"
+			"address": "0x21547294899fc37CAfa9EA0d1231D3F0b9ABd1F7"
 		},
 		{
 			"id": "escalationGameFactory",
 			"label": "Escalation Game Factory",
-			"address": "0x94A7FB6E5a8EDC6559B748aD4FEAd0Bc68f4fCfD"
+			"address": "0x0f8E07792B60329dD8FFcbAc99577816c74c130F"
 		},
 		{
 			"id": "securityPoolFactory",
 			"label": "Security Pool Factory",
-			"address": "0x0070464ef3Fb90B5D3e128e47D5ffB20e12f24E6"
+			"address": "0x8d36A27ce150F7F7f4077dC84589Bd501fA363B5"
 		}
 	]
 }

docs/mainnet-deployment-addresses.md

@@ -15,18 +15,18 @@ These values are derived from the frozen mainnet protocol config, current contra
 | ID | Label | Expected Address |
 | --- | --- | --- |
 | proxyDeployer | Proxy Deployer | `0x7A0D94F55792C434d74a40883C6ed8545E406D12` |
-| deploymentStatusOracle | Deployment Status Oracle | `0x138aa911c7E0d63DD3C81e4675EC8A08883728b3` |
+| deploymentStatusOracle | Deployment Status Oracle | `0xD262Bb8bBa927dD08a3fd3d6adcbAB9660B5F2e5` |
 | multicall3 | Multicall3 | `0x77609e84c39893D5fB99049FE0F461aEB4F4Ec79` |
-| uniformPriceDualCapBatchAuctionFactory | UniformPriceDualCapBatchAuctionFactory | `0x47A117D404C31b5CFF82883D40c0610404D26a60` |
+| uniformPriceDualCapBatchAuctionFactory | UniformPriceDualCapBatchAuctionFactory | `0xbA605970da511b08539bcC4F77B54CF1Cd72783c` |
 | scalarOutcomes | ScalarOutcomes | `0x5890b011CF7E36d4Fee28Bac8B5be6f61C392a4C` |
-| securityPoolUtils | SecurityPoolUtils | `0x9E90338b17E1Fea80Cd356607EbB6eC46653fB24` |
+| securityPoolUtils | SecurityPoolUtils | `0x04349f6A0302F32f8c87bb8555648AD77634343C` |
 | openOracle | OpenOracle | `0x51DED022c087758c187ce636aa5f6adE6B919abB` |
 | zoltarQuestionData | ZoltarQuestionData | `0xeadF91d12F549786891350B3D535638713651207` |
 | zoltar | Zoltar | `0xd282Ae3cC11423c740afD608e715CD4e22831A29` |
-| shareTokenFactory | ShareTokenFactory | `0x253d011F3A0f46096A4756a439543E9Dab36AA23` |
-| priceOracleManagerAndOperatorQueuerFactory | Price Oracle Manager Factory | `0x38d22Ec4282621eeeBE4EBFf04E08b893dC020FF` |
-| securityPoolForker | Security Pool Forker | `0x290BF23Dd1912AdEDBdfd7419b85605C66e3d24B` |
-| escalationGameFactory | Escalation Game Factory | `0x94A7FB6E5a8EDC6559B748aD4FEAd0Bc68f4fCfD` |
-| securityPoolFactory | Security Pool Factory | `0x0070464ef3Fb90B5D3e128e47D5ffB20e12f24E6` |
+| shareTokenFactory | ShareTokenFactory | `0x95fB9708d8e54e057d2bdf027D6C43B586Ca898F` |
+| priceOracleManagerAndOperatorQueuerFactory | Price Oracle Manager Factory | `0xAA71aD70f8bed84f0fd57D711f21fae8D6310354` |
+| securityPoolForker | Security Pool Forker | `0x21547294899fc37CAfa9EA0d1231D3F0b9ABd1F7` |
+| escalationGameFactory | Escalation Game Factory | `0x0f8E07792B60329dD8FFcbAc99577816c74c130F` |
+| securityPoolFactory | Security Pool Factory | `0x8d36A27ce150F7F7f4077dC84589Bd501fA363B5` |
 
 Security pool deployments are deterministic per pool input rather than globally fixed. Their addresses are derived from the deployed factory set plus parent universe, universe ID, question ID, and security multiplier.

solidity/contracts/peripherals/SecurityPool.sol

@@ -472,7 +472,8 @@ contract SecurityPool is ISecurityPool {
 	// Complete Sets
 	////////////////////////////////////////
 	function createCompleteSet() external payable isOperational {
-		// TODO, we want to be able to create complete sets in the children right away, figure accounting out
+		// Child pools mint complete sets only after migration and truth-auction
+		// accounting have restored `SystemState.Operational`.
 		require(!isEscalationResolved(), 'question resolved');
 		require(msg.value > 0, 'need eth');
 		updateCollateralAmount();

solidity/ts/tests/peripherals.test.ts

@@ -2779,6 +2779,56 @@ describe('Peripherals Contract Test Suite', () => {
 		strictEqualTypeSafe(childVaultAfterRedeem.repDepositShare, 0n, 'operational child pool should allow redeemed ownership to clear')
 	})
 
+	test('child pool complete-set minting waits for settled fork accounting', async () => {
+		const forkThreshold = (await getTotalTheoreticalSupply(client, await getRepToken(client, securityPoolAddresses.securityPool))) / 20n
+		const passiveRepHolder = createWriteClient(mockWindow, TEST_ADDRESSES[6], 0)
+		await approveAndDepositRep(passiveRepHolder, 2n * forkThreshold, questionId)
+		const parentAllowance = repDeposit / 4n
+		await manipulatePriceOracleAndPerformOperation(client, mockWindow, securityPoolAddresses.priceOracleManagerAndOperatorQueuer, OperationType.SetSecurityBondsAllowance, client.account.address, parentAllowance)
+		const parentMintAmount = 5n * 10n ** 18n
+		await createCompleteSet(client, securityPoolAddresses.securityPool, parentMintAmount)
+
+		await triggerExternalForkForSecurityPool(undefined, 'complete-set child mint fork source')
+		await migrateRepToZoltar(client, securityPoolAddresses.securityPool, [QuestionOutcome.Yes])
+		await migrateVault(client, securityPoolAddresses.securityPool, QuestionOutcome.Yes)
+
+		const yesUniverse = getChildUniverseId(genesisUniverse, QuestionOutcome.Yes)
+		const yesSecurityPool = getSecurityPoolAddresses(securityPoolAddresses.securityPool, yesUniverse, questionId, securityMultiplier)
+
+		strictEqualTypeSafe(await getSystemState(client, yesSecurityPool.securityPool), SystemState.ForkMigration, 'child pool should wait in migration state before accounting is settled')
+		await assert.rejects(createCompleteSet(client, yesSecurityPool.securityPool, 1n), /not operational/)
+
+		await mockWindow.advanceTime(8n * 7n * DAY + DAY)
+		await startTruthAuction(client, yesSecurityPool.securityPool)
+		strictEqualTypeSafe(await getSystemState(client, yesSecurityPool.securityPool), SystemState.ForkTruthAuction, 'partially migrated child pool should price unsettled accounting through a truth auction')
+		const repAtFork = (await getSecurityPoolForkerForkData(client, securityPoolAddresses.securityPool)).auctionableRepAtFork
+		const migratedRep = await getMigratedRep(client, yesSecurityPool.securityPool)
+		const completeSetAmount = await getCompleteSetCollateralAmount(client, securityPoolAddresses.securityPool)
+		const expectedEthToBuy = completeSetAmount - (completeSetAmount * migratedRep) / repAtFork
+		strictEqualTypeSafe(expectedEthToBuy > 0n, true, 'partial migration should leave ETH for the truth auction to buy')
+		const auctionParticipant = createWriteClient(mockWindow, TEST_ADDRESSES[2], 0)
+		await participateAuction(auctionParticipant, yesSecurityPool.truthAuction, repAtFork / 4n, expectedEthToBuy)
+		await mockWindow.advanceTime(7n * DAY + DAY)
+		await finalizeTruthAuction(client, yesSecurityPool.securityPool)
+		strictEqualTypeSafe(await getSystemState(client, yesSecurityPool.securityPool), SystemState.Operational, 'child pool should become operational after truth-auction accounting settles')
+		strictEqualTypeSafe(await getQuestionOutcome(client, yesSecurityPool.securityPool), QuestionOutcome.None, 'unrelated fork should leave the child pool question unresolved')
+		strictEqualTypeSafe(await getTotalSecurityBondAllowance(client, yesSecurityPool.securityPool), parentAllowance, 'child pool should inherit parent security-bond capacity before minting new sets')
+
+		const childMintAmount = 1n * 10n ** 18n
+		await updateVaultFees(client, yesSecurityPool.securityPool, client.account.address)
+		const childCollateralBeforeMint = await getCompleteSetCollateralAmount(client, yesSecurityPool.securityPool)
+		const childShareSupplyBeforeMint = await getShareTokenSupply(client, yesSecurityPool.securityPool)
+
+		await createCompleteSet(client, yesSecurityPool.securityPool, childMintAmount)
+
+		const childCollateralAfterMint = await getCompleteSetCollateralAmount(client, yesSecurityPool.securityPool)
+		assert.ok(childCollateralAfterMint > childCollateralBeforeMint, 'child complete-set mint should increase collateral after fork accounting is settled')
+		assert.ok(childCollateralAfterMint <= childCollateralBeforeMint + childMintAmount, 'child complete-set mint should accrue fees before adding new collateral')
+		const updatedCollateralBeforeMint = childCollateralAfterMint - childMintAmount
+		const expectedMintedShares = updatedCollateralBeforeMint === 0n ? childMintAmount * PRICE_PRECISION : (childMintAmount * childShareSupplyBeforeMint) / updatedCollateralBeforeMint
+		strictEqualTypeSafe(await getShareTokenSupply(client, yesSecurityPool.securityPool), childShareSupplyBeforeMint + expectedMintedShares, 'child complete-set mint should add shares at the settled exchange rate')
+	})
+
 	test('can migrate escalation deposits before migrateVault', async () => {
 		const endTime = await getQuestionEndDate(client, questionId)
 		await mockWindow.setTime(endTime + 10000n)

ui/Dockerfile

@@ -2,7 +2,9 @@
 # App Setup: Install dependencies and build app
 # ---------------------------------------------
 
-FROM oven/bun:1.3.9-alpine AS builder
+ARG BUN_VERSION=1.3.13
+
+FROM oven/bun:${BUN_VERSION}-alpine AS builder
 
 # git is required by preinstall hook scripts (link-shared-node-modules.mjs uses git rev-parse)
 RUN apk add --no-cache git
@@ -13,15 +15,16 @@ RUN git init
 COPY ./scripts/ /source/scripts/
 COPY ./ui/scripts/ /source/ui/scripts/
 
-# Install root dependencies
-COPY ./package.json ./bun.lock /source/
-RUN bun install --frozen-lockfile
-
-# Shared package metadata and outputs for local package resolution
+# Shared package metadata and source for local package resolution
 COPY ./shared/package.json /source/shared/package.json
 COPY ./shared/tsconfig.json /source/shared/tsconfig.json
-COPY ./shared/js/ /source/shared/js/
 COPY ./shared/ts/ /source/shared/ts/
+RUN mkdir -p /source/shared/js
+
+# Install root dependencies and build generated shared outputs from tracked source.
+COPY ./package.json ./bun.lock /source/
+RUN bun install --frozen-lockfile
+RUN bun run shared:build
 
 # Install Solidity dependencies
 COPY ./solidity/package.json ./solidity/bun.lock /source/solidity/