BIP-X: Tractor (+ Junctions)

.github/workflows/ci.protocol.yaml

@@ -23,7 +23,7 @@ jobs:
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
       - name: Install Dependencies
         if: steps.node-modules-cache.outputs.cache-hit != 'true'
-        run: yarn install --immutable
+        run: yarn install --no-immutable
       - run: yarn generate
         working-directory: protocol
       - run: yarn test

.github/workflows/ci.sdk-core.yaml

@@ -24,13 +24,8 @@ jobs:
       - name: Install Dependencies
         if: steps.node-modules-cache.outputs.cache-hit != 'true'
         run: yarn install --immutable
-      - name: Install rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          target: wasm32-unknown-unknown
-          profile: minimal
-          override: true
+      - name: Install Rust (Stable)
+        run: curl https://sh.rustup.rs -sSf | sh -s -- -y
       - name: Install Anvil
         uses: foundry-rs/foundry-toolchain@v1
         with:

.github/workflows/ci.sdk-wells.yaml

@@ -26,13 +26,8 @@ jobs:
         run: yarn install --immutable
       - name: Generate Typedefs
         run: yarn sdk:generate
-      - name: Install rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          target: wasm32-unknown-unknown
-          profile: minimal
-          override: true
+      - name: Install Rust (Stable)
+        run: curl https://sh.rustup.rs -sSf | sh -s -- -y
       - name: Install Anvil
         uses: foundry-rs/foundry-toolchain@v1
         with:

.github/workflows/ci.sdk.yaml

@@ -24,22 +24,15 @@ jobs:
       - name: Install Dependencies
         if: steps.node-modules-cache.outputs.cache-hit != 'true'
         run: yarn install --immutable
-      - name: Install rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          target: wasm32-unknown-unknown
-          profile: minimal
-          override: true
+      - name: Install Rust (Stable)
+        run: curl https://sh.rustup.rs -sSf | sh -s -- -y
       - name: Install Anvil
         uses: foundry-rs/foundry-toolchain@v1
         with:
           version: nightly
       # TODO: Cache Anvil RPC calls between runs to speed up tests
       - name: Launch Anvil
-        run: anvil --fork-url $ANVIL_FORK_URL --chain-id 1337 &
-        env:
-          ANVIL_FORK_URL: ${{ secrets.ANVIL_FORK_URL }}
+        run: yarn anvil4tests &
       - name: Build All
         run: yarn build
       - run: yarn sdk:test

.github/workflows/ci.ui.yaml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: UI Tests
+      - name: Setup Node
         uses: actions/setup-node@v3
         with:
           node-version: "16"
@@ -30,3 +30,5 @@ jobs:
         run: yarn ui:generate
       - name: Unit Tests
         run: yarn ui:test
+        env:
+          VITE_ALCHEMY_API_KEY: ${{ secrets.VITE_ALCHEMY_API_KEY }}

.node-version

@@ -0,0 +1 @@
+v18.18

README.md

@@ -27,8 +27,8 @@
 
 [![Discord][discord-badge]][discord-url]
 
-Code Version: `2.6.0` <br>
-Whitepaper Version: `2.6.0`
+Code Version: `2.7.3` <br>
+Whitepaper Version: `2.7.0`
 
 ## About
 

jest.config.ts

@@ -1,12 +1,15 @@
 import type { JestConfigWithTsJest } from "ts-jest";
 
 const jestConfig: JestConfigWithTsJest = {
+  testSequencer: "<rootDir>/testSequencer.js",
+  runner: "jest-serial-runner",
   projects: [
     {
       // @ts-ignore
       preset: "ts-jest",
       displayName: "sdk-wells",
       rootDir: "projects/sdk-wells",
+
       testMatch: ["<rootDir>/src/**/?(*.)+(spec|test).[jt]s?(x)", "<rootDir>/test/**/?(*.)+(spec|test).[jt]s?(x)"],
       moduleNameMapper: {
         "@beanstalk/sdk-wells/(.*)$": "<rootDir>/src/$1",

package.json

@@ -11,6 +11,7 @@
     "@types/prettier": "^2",
     "husky": "8.0.1",
     "jest": "29.2.2",
+    "jest-serial-runner": "1.2.1",
     "lint-staged": "13.1.0",
     "prettier": "2.7.1",
     "ts-jest": "29.0.3",
@@ -43,6 +44,8 @@
     "ui:build": "yarn workspace ui build",
     "ui:test": "yarn workspace ui test",
     "test:browser": "yarn workspace tests test:browser",
-    "ex": "yarn workspace @beanstalk/examples x"
+    "ex": "yarn workspace @beanstalk/examples x",
+    "anvil": "anvil --fork-url https://eth-mainnet.g.alchemy.com/v2/5ubn94zT7v7DnB5bNW1VOnoIbX5-AG2N --chain-id 1337",
+    "anvil4tests": "anvil --fork-url https://eth-mainnet.g.alchemy.com/v2/Kk7ktCQL5wz4v4AG8bR2Gun8TAASQ-qi  --chain-id 1337 --fork-block-number 18629000"
   }
 }

projects/cli/src/cli.ts

@@ -8,6 +8,8 @@ import { sunrise } from "./commands/sunrise.js";
 import { setPrice } from "./commands/setprice.js";
 import { help } from "./commands/help.js";
 import { mineBlocks } from "./commands/mine.js";
+import { setDeltaB } from "./commands/setDeltaB.js";
+import { getDeltaB } from "./commands/getDeltaB.js";
 
 main().catch((e) => {
   console.log("FAILED:");
@@ -28,6 +30,7 @@ async function main() {
   const args = commandLineArgs(commands, { partial: true });
 
   const { sdk, chain, stop } = await setupSDK(args);
+  sdk.DEBUG = false;
 
   switch (args.command) {
     case "balance":
@@ -45,6 +48,17 @@ async function main() {
     case "mine":
       await mineBlocks(sdk, args.amount);
       break;
+    case "setpriceabove":
+    case "setpriceover":
+      await setDeltaB(sdk, chain, "up", args.amount);
+      break;
+    case "setpricebelow":
+    case "setpriceunder":
+      await setDeltaB(sdk, chain, "down", args.amount);
+      break;
+    case "deltab":
+      await getDeltaB(sdk);
+      break;
     case "help":
     default:
       await help();

projects/cli/src/commands/getDeltaB.ts

@@ -0,0 +1,7 @@
+import { BeanstalkSDK } from "@beanstalk/sdk";
+import chalk from "chalk";
+
+export const getDeltaB = async (sdk: BeanstalkSDK) => {
+  const deltaB = await sdk.bean.getDeltaB();
+  console.log(`${chalk.bold.whiteBright("DeltaB: ")} ${chalk.greenBright(deltaB.toHuman())}`);
+};

projects/cli/src/commands/help.ts

@@ -47,8 +47,22 @@ export const help = () => {
       content: [
         { name: "{bold.greenBright balance}", summary: "Display balance(s). Optionally specify account or token" },
         { name: "{bold.greenBright setbalance}", summary: "Set balance(s). Optionally specify account, token, or amount" },
-        { name: "{bold.greenBright setprice}", summary: "Set BEAN price by setting liquidity. Defaults to 20M BEAN and 20M 3CRV. Parameters are millions. See examples below" },
+        {
+          name: "{bold.greenBright setprice}",
+          summary: "Set BEAN price by setting liquidity. Defaults to 20M BEAN and 20M 3CRV. Parameters are millions. See examples below"
+        },
         { name: "{bold.greenBright sunrise}", summary: "Calls the sunrise() function" },
+        { name: "{bold.greenBright mine}", summary: "Mines a block (or more)" },
+        { name: "{bold.greenBright deltab}", summary: "Display current DeltaB" },
+        {
+          name: "{bold.greenBright setpriceover}",
+          summary: "Buys enough BEANs to set DeltaB over 0, and the price over 1.00. Multiplier may be applied"
+        },
+        {
+          name: "{bold.greenBright setpriceunder}",
+          summary: "Sells enough BEANs to set DeltaB under 0, and the price under 1.00. Multiplier may be applied"
+        },
+
         { name: "{bold.greenBright help}", summary: "You're looking at it :)" }
       ]
     },

projects/cli/src/commands/setDeltaB.ts

@@ -0,0 +1,18 @@
+import { BeanstalkSDK } from "@beanstalk/sdk";
+import { BlockchainUtils } from "@beanstalk/sdk/dist/types/utils/TestUtils";
+import chalk from "chalk";
+import { table } from "table";
+
+export const setDeltaB = async (sdk: BeanstalkSDK, chain: BlockchainUtils, direction: string, amount) => {
+  const multiplier = amount === "50000" ? 2 : amount;
+  if (direction === "down") {
+    await chain.setPriceUnder1(multiplier);
+  } else if (direction === "up") {
+    await chain.setPriceOver1(multiplier);
+  } else {
+    console.log(`unknown input: ${direction}. Expected "up", or "down"`);
+  }
+
+  const deltaB = await sdk.bean.getDeltaB();
+  console.log(`${chalk.bold.whiteBright("New DeltaB: ")} ${chalk.greenBright(deltaB.toHuman())}`);
+};

projects/dex-ui/.env.local.example

@@ -1,4 +1,5 @@
 VITE_AQUIFER_ADDRESS=local/fork deployed address
 VITE_ALCHEMY_API_KEY="your key here"
 VITE_WELLS_ORIGIN_BLOCK=17138465
-VITE_LOAD_HISTORY_FROM_GRAPH=0
+VITE_LOAD_HISTORY_FROM_GRAPH=0
+VITE_WALLET_CONNECT_PROJECT_ID="project key here"

projects/dex-ui/.env.production

@@ -2,3 +2,4 @@
 // ONLY USE THIS FILE TO TRACK WHAT ENV VARS NEED TO 
 // BE ADDED TO NETLIFY CONFIG
 VITE_ALCHEMY_API_KEY=""
+VITE_WALLET_CONNECT_PROJECT_ID=""

projects/dex-ui/codegen.ts

@@ -2,7 +2,11 @@ import { CodegenConfig } from "@graphql-codegen/cli";
 
 const config: CodegenConfig = {
   overwrite: true,
-  schema: "graphql.schema.json",
+  schema: [
+    "graphql.schema.json",
+    // beanstalk subgraph
+    "https://graph.node.bean.money/subgraphs/name/beanstalk"
+  ],
   documents: "src/**/*.graphql",
   ignoreNoDocuments: true,
   generates: {

projects/dex-ui/src/abi/MULTI_PUMP_ABI.json

@@ -0,0 +1,115 @@
+[
+  {
+    "inputs": [
+      { "internalType": "bytes16", "name": "_maxPercentIncrease", "type": "bytes16" },
+      { "internalType": "bytes16", "name": "_maxPercentDecrease", "type": "bytes16" },
+      { "internalType": "uint256", "name": "_capInterval", "type": "uint256" },
+      { "internalType": "bytes16", "name": "_alpha", "type": "bytes16" }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  { "inputs": [], "name": "NoTimePassed", "type": "error" },
+  { "inputs": [], "name": "NotInitialized", "type": "error" },
+  {
+    "inputs": [],
+    "name": "ALPHA",
+    "outputs": [{ "internalType": "bytes16", "name": "", "type": "bytes16" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "CAP_INTERVAL",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "LOG_MAX_DECREASE",
+    "outputs": [{ "internalType": "bytes16", "name": "", "type": "bytes16" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "LOG_MAX_INCREASE",
+    "outputs": [{ "internalType": "bytes16", "name": "", "type": "bytes16" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "well", "type": "address" }],
+    "name": "readCappedReserves",
+    "outputs": [{ "internalType": "uint256[]", "name": "cappedReserves", "type": "uint256[]" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "well", "type": "address" },
+      { "internalType": "bytes", "name": "", "type": "bytes" }
+    ],
+    "name": "readCumulativeReserves",
+    "outputs": [{ "internalType": "bytes", "name": "cumulativeReserves", "type": "bytes" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "well", "type": "address" },
+      { "internalType": "bytes", "name": "", "type": "bytes" }
+    ],
+    "name": "readInstantaneousReserves",
+    "outputs": [{ "internalType": "uint256[]", "name": "emaReserves", "type": "uint256[]" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "well", "type": "address" }],
+    "name": "readLastCappedReserves",
+    "outputs": [{ "internalType": "uint256[]", "name": "lastCappedReserves", "type": "uint256[]" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "well", "type": "address" }],
+    "name": "readLastCumulativeReserves",
+    "outputs": [{ "internalType": "bytes16[]", "name": "cumulativeReserves", "type": "bytes16[]" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "well", "type": "address" }],
+    "name": "readLastInstantaneousReserves",
+    "outputs": [{ "internalType": "uint256[]", "name": "emaReserves", "type": "uint256[]" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "well", "type": "address" },
+      { "internalType": "bytes", "name": "startCumulativeReserves", "type": "bytes" },
+      { "internalType": "uint256", "name": "startTimestamp", "type": "uint256" },
+      { "internalType": "bytes", "name": "", "type": "bytes" }
+    ],
+    "name": "readTwaReserves",
+    "outputs": [
+      { "internalType": "uint256[]", "name": "twaReserves", "type": "uint256[]" },
+      { "internalType": "bytes", "name": "cumulativeReserves", "type": "bytes" }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "uint256[]", "name": "reserves", "type": "uint256[]" },
+      { "internalType": "bytes", "name": "", "type": "bytes" }
+    ],
+    "name": "update",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]