Merge branch 'master' into crispheaney/only-run-verified-build-when-need

drift-labs · Jul 8, 2024 · 0cffe5d · 0cffe5d
2 parents d6ddb3c + 0e33784
commit 0cffe5d
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 27 deletions.
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -2,26 +2,26 @@ name: Soteria
 
 on:
   push:
-    branches: 
+    branches:
       - master
   pull_request:
-    branches: 
+    branches:
       - master
 
 env:
   CARGO_TERM_COLOR: always
   SOLANA_VERSION: "1.9.5"
-  PROGRAM_PATH: "programs/drift/" 
+  PROGRAM_PATH: "programs/drift/"
   RUST_TOOLCHAIN: nightly-2022-02-07
 
 jobs:
   build:
     name: Soteria Scan
-    runs-on: ubuntu-latest
+    runs-on: ubicloud
     steps:
       - name: Checkout changes
         uses: actions/checkout@v2
-        
+
       - name: Cache Solana Version
         uses: actions/cache@v2
         id: solana-cache
@@ -31,7 +31,7 @@ jobs:
             ~/.cache/solana
             ~/.local/share/solana
           key: solana-v${{ env.SOLANA_VERSION }}
-          
+
       - name: Cache Soteria Build
         uses: Swatinem/rust-cache@v1
         with:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ env:
 jobs:
   fmt-clippy:
     name: fmt & clippy
-    runs-on: ubuntu-latest
+    runs-on: ubicloud
     steps:
       - uses: actions/checkout@v2
       - name: Install Rust nightly
@@ -37,7 +37,7 @@ jobs:
         run: cargo clippy -p drift
   unit:
     name: Unit tests
-    runs-on: ubuntu-latest
+    runs-on: ubicloud
     steps:
       - uses: actions/checkout@v2
       - name: Install Rust toolchain
@@ -55,7 +55,7 @@ jobs:
 # disable until solana-client is upgraded
 #  cargo-audit:
 #    name: Cargo audit
-#    runs-on: ubuntu-latest
+#    runs-on: ubicloud
 #    steps:
 #      - uses: actions/checkout@v2
 #      - name: Cache cargo-audit version
@@ -68,7 +68,7 @@ jobs:
 #      - name: Run cargo-audit # Using args from .cargo/audit.toml
 #        run: cargo audit
   yarn-prettier:
-    runs-on: ubuntu-latest
+    runs-on: ubicloud
     steps:
       - uses: actions/checkout@v2
       - name: Setup node
@@ -83,7 +83,7 @@ jobs:
       - name: Run prettier
         run: yarn prettify
   yarn-lint:
-    runs-on: ubuntu-latest
+    runs-on: ubicloud
     steps:
       - uses: actions/checkout@v2
       - name: Setup node
@@ -96,7 +96,7 @@ jobs:
       - name: Run lint
         run: yarn lint
   anchor-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubicloud
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v2
@@ -143,7 +143,7 @@ jobs:
       - name: run anchor tests
         run: bash test-scripts/run-anchor-tests.sh
   check-for-sdk-changes:
-    runs-on: ubuntu-latest
+    runs-on: ubicloud
     # Set job outputs to values from filter step
     outputs:
       sdk: ${{ steps.filter.outputs.sdk }}
@@ -157,7 +157,7 @@ jobs:
             sdk:
               - 'sdk/**'
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubicloud
     needs:
       [
         fmt-clippy,
@@ -202,7 +202,7 @@ jobs:
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
   emit-dispatch-events:
-    runs-on: ubuntu-latest
+    runs-on: ubicloud
     needs: [release, check-for-sdk-changes]
     if: ${{ github.ref == 'refs/heads/master' && needs.check-for-sdk-changes.outputs.sdk == 'true' }}
     strategy:
@@ -246,7 +246,7 @@ jobs:
               - 'programs/drift/Cargo.toml'
   verified-build:
     name: Build Verifiable Artifact
-    runs-on: ubuntu-latest
+    runs-on: ubicloud
     needs:
       [
           check-for-program-version-changes,

diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
@@ -2,16 +2,16 @@ name: Security Scans
 
 on:
   push:
-    branches: 
+    branches:
       - master
   pull_request:
-    branches: 
+    branches:
       - master
 
 jobs:
   monitor:
     name: Sync with snyk.io
-    runs-on: ubuntu-latest
+    runs-on: ubicloud
     steps:
       - uses: actions/checkout@master
       - name: Monitor on snyk.io
@@ -23,17 +23,17 @@ jobs:
   sast:
     needs: monitor
     name: Code Scan
-    runs-on: ubuntu-latest
+    runs-on: ubicloud
     steps:
       - name: Checkout changes
         uses: actions/checkout@v2
-        
+
       - uses: snyk/actions/setup@master
       - name: Snyk Code Scan
         run: snyk code test --org=${{ secrets.SNYK_ORG }} --severity-threshold=medium --sarif-file-output=snyk-sast.json
         env:
            SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-           
+
       - name: Upload code report
         if: always()
         uses: github/codeql-action/upload-sarif@v1
@@ -42,18 +42,18 @@ jobs:
   sca:
       needs: monitor
       name: Dependency Scan
-      runs-on: ubuntu-latest
+      runs-on: ubicloud
       steps:
         - name: Checkout changes
           uses: actions/checkout@v2
-          
+
         - name: Snyk Dependency Scan
           uses: snyk/actions/node@master
           env:
             SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
           with:
             args: --all-projects --org=${{ secrets.SNYK_ORG }} --severity-threshold=medium --fail-on=upgradable --sarif-file-output=snyk-sca.sarif
-            
+
         - name: Upload dependency report
           if: always()
           uses: github/codeql-action/upload-sarif@v1

diff --git a/sdk/VERSION b/sdk/VERSION
@@ -1 +1 @@
-2.86.0-beta.1
+2.86.0-beta.2
diff --git a/sdk/package.json b/sdk/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.86.0-beta.1",
+	"version": "2.86.0-beta.2",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

diff --git a/sdk/src/constants/perpMarkets.ts b/sdk/src/constants/perpMarkets.ts
@@ -722,6 +722,16 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1719415157000,
 		oracleSource: OracleSource.SWITCHBOARD,
 	},
+	{
+		fullName: 'POPCAT',
+		category: ['Meme', 'Solana'],
+		symbol: 'POPCAT-PERP',
+		baseAssetSymbol: 'POPCAT',
+		marketIndex: 34,
+		oracle: new PublicKey('2stQe1XLGkuTZ22gQrgZKsb93iG9mWXSLfANMPRjs5Ky'),
+		launchTs: 1720013054000,
+		oracleSource: OracleSource.SWITCHBOARD,
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

diff --git a/sdk/src/constants/spotMarkets.ts b/sdk/src/constants/spotMarkets.ts
@@ -334,6 +334,19 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		precisionExp: SIX,
 		launchTs: 1719415157000,
 	},
+	{
+		symbol: 'POPCAT',
+		marketIndex: 20,
+		oracle: new PublicKey('2stQe1XLGkuTZ22gQrgZKsb93iG9mWXSLfANMPRjs5Ky'),
+		oracleSource: OracleSource.SWITCHBOARD,
+		mint: new PublicKey('7GCihgDB8fe6KNjn2MYtkzZcRjQy3t9GHdC8uHYmW2hr'),
+		precision: new BN(10).pow(NINE),
+		precisionExp: NINE,
+		launchTs: 1720013054000,
+		phoenixMarket: new PublicKey(
+			'31XgvAQ1HgFQEk31KdszbPkVXKaQqB1bgYZPoDrFpSR2'
+		),
+	},
 ];
 
 export const SpotMarkets: { [key in DriftEnv]: SpotMarketConfig[] } = {

diff --git a/tests/testHelpers.ts b/tests/testHelpers.ts
@@ -1016,6 +1016,10 @@ export async function initializeQuoteSpotMarket(
 		maintenanceLiabilityWeight,
 		imfFactor
 	);
+
+	// @ts-ignore
+	admin.accountSubscriber.spotOracleMap.set(0, PublicKey.default);
+
 	await admin.updateWithdrawGuardThreshold(
 		marketIndex,
 		new BN(10 ** 10).mul(QUOTE_PRECISION)