diff --git a/.github/actions/cache-solana/action.yml b/.github/actions/cache-solana/action.yml index efe9711..d8afb06 100644 --- a/.github/actions/cache-solana/action.yml +++ b/.github/actions/cache-solana/action.yml @@ -8,7 +8,7 @@ description: install and Cache Solana binaries runs: using: composite steps: - - uses: actions/cache@v3 + - uses: actions/cache@v4 id: cache-solana with: path: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 64ce060..0a3e5fe 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,16 +7,16 @@ jobs: install: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ./.github/actions/cache-solana - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: '18' - name: Cache node dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: '**/node_modules' key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }} @@ -41,7 +41,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Cache rust uses: Swatinem/rust-cache@v2 - name: Run fmt @@ -53,11 +53,11 @@ jobs: needs: install runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Cache rust uses: Swatinem/rust-cache@v2 - uses: ./.github/actions/cache-solana - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.cargo/registry @@ -69,8 +69,8 @@ jobs: - name: Upload build artifacts uses: actions/upload-artifact@v3 with: - name: target - path: target + name: target_deploy + path: target/deploy if-no-files-found: error retention-days: 1 @@ -79,11 +79,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Cache rust uses: Swatinem/rust-cache@v2 - uses: ./.github/actions/cache-solana - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.cargo/registry @@ -99,14 +99,14 @@ jobs: needs: install runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node ${{ matrix.node }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: '18' - name: Cache node dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: '**/node_modules' key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }} @@ -126,14 +126,14 @@ jobs: needs: yarn-build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node ${{ matrix.node }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: '18' - name: Cache node dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: '**/node_modules' key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }} @@ -150,19 +150,19 @@ jobs: yarn lint functional-test: - needs: [clippy-lint, yarn-lint, cargo-build] + needs: [yarn-build, cargo-build] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node ${{ matrix.node }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: '18' - name: Cache node dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: '**/node_modules' key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }} @@ -179,11 +179,17 @@ jobs: - name: Download Rust build artifacts uses: actions/download-artifact@v3 with: - name: target - path: . + name: target_deploy + path: ./target + + - name: Download TS build artifacts + uses: actions/download-artifact@v3 + with: + name: dists + path: packages/sdks - uses: ./.github/actions/cache-solana - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.cargo/registry @@ -193,11 +199,20 @@ jobs: - name: run tests run: | ls target/deploy + ls packages/sdks/common/dist/cjs #yarn anchor test --skip-build packages/tests/src/functional/beams/core.test.ts yarn test - - uses: actions/upload-artifact@v3 + - name: upload program logs + uses: actions/upload-artifact@v3 if: always() with: name: program-logs - path: .anchor/program-logs/* \ No newline at end of file + path: .anchor/program-logs/* + + - name: upload test report + uses: actions/upload-artifact@v3 + if: always() + with: + name: test-report + path: mochawesome-report/* \ No newline at end of file diff --git a/packages/sdks/spl/src/index.ts b/packages/sdks/spl/src/index.ts index 4c91db5..f5d7243 100644 --- a/packages/sdks/spl/src/index.ts +++ b/packages/sdks/spl/src/index.ts @@ -455,6 +455,8 @@ export class SplClient extends BeamInterface { systemProgram: SystemProgram.programId, tokenProgram: TOKEN_PROGRAM_ID, }; + console.log("EXTRACT YIELD ACCOUNTS"); + console.log(accounts); const instruction = await this.program.methods .extractYield() .accounts(accounts) diff --git a/packages/tests/src/utils.ts b/packages/tests/src/utils.ts index c8c1976..1699337 100644 --- a/packages/tests/src/utils.ts +++ b/packages/tests/src/utils.ts @@ -147,14 +147,14 @@ export const waitForNextEpoch = async (provider: AnchorProvider) => { const startSlot = startingEpoch.slotIndex; let subscriptionId = 0; - log("Waiting for epoch", nextEpoch); + logAtLevel("info")("Waiting for epoch", nextEpoch); await new Promise((resolve) => { subscriptionId = provider.connection.onSlotChange((slotInfo) => { - log("slot", slotInfo.slot, "startSlot", startSlot); + logAtLevel("trace")("slot", slotInfo.slot, "startSlot", startSlot); if (slotInfo.slot % SLOTS_IN_EPOCH === 1 && slotInfo.slot > startSlot) { void provider.connection.getEpochInfo().then((currentEpoch) => { - log("currentEpoch", currentEpoch); + logAtLevel("trace")("currentEpoch", currentEpoch); if (currentEpoch.epoch === nextEpoch) { resolve(slotInfo.slot); }