Skip to content

Commit

Permalink
Merge branch 'dev' into jt/sc-14942/provide-swap-data-view-for-fe
Browse files Browse the repository at this point in the history
  • Loading branch information
zerotucks committed Apr 3, 2024
2 parents f36d761 + f0cc7a7 commit d9ddcf0
Show file tree
Hide file tree
Showing 387 changed files with 34,094 additions and 10,639 deletions.
52 changes: 52 additions & 0 deletions .github/workflows/build-integration-test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: CI
on:
pull_request:
types: [opened, synchronize]

jobs:
build:
name: Build and Integration Test
timeout-minutes: 15
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3
with:
fetch-depth: 2

- name: Cache turbo build setup
uses: actions/cache@v3
with:
path: .turbo
key: ${{ runner.os }}-turbo-${{ github.sha }}
restore-keys: |
${{ runner.os }}-turbo-
- uses: pnpm/action-setup@v2.0.1
with:
version: 8.14.1

- name: Setup Node.js environment
uses: actions/setup-node@v3
with:
node-version: 20
cache: 'pnpm'

- name: Install dependencies
run: pnpm install

- name: Prebuild
run: pnpm prebuild

- name: Build
run: pnpm build

- name: Test
run: pnpm test:integration
env:
ONE_INCH_API_KEY: ${{ secrets.ONE_INCH_API_KEY }}
ONE_INCH_API_VERSION: ${{ secrets.ONE_INCH_API_VERSION }}
ONE_INCH_API_URL: ${{ secrets.ONE_INCH_API_URL }}
ONE_INCH_ALLOWED_SWAP_PROTOCOLS: ${{ secrets.ONE_INCH_ALLOWED_SWAP_PROTOCOLS }}
ONE_INCH_SWAP_CHAIN_IDS: ${{ secrets.ONE_INCH_SWAP_CHAIN_IDS }}
MAINNET_RPC_URL: ${{ secrets.MAINNET_RPC_URL }}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Build Pull Request
name: CI
on:
pull_request:
types: [opened, synchronize]

jobs:
build:
name: Build and Test
name: Build and Unit Test
timeout-minutes: 15
runs-on: ubuntu-latest
steps:
Expand Down
1 change: 1 addition & 0 deletions bin/clear-all-artifacts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
./bin/clean-build.sh
find . -name node_modules -type d -exec rm -rvf {} \;
find . -name cache -type d -exec rm -rvf {} \;
find . -name coverage -type d -exec rm -rvf {} \;
find . -name .turbo -type d -exec rm -rvf {} \;
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"lint": "turbo run lint --cache-dir=.turbo",
"lint:fix": "turbo run lint:fix",
"test": "turbo run test --cache-dir=.turbo",
"test:integration": "turbo run test:integration --cache-dir=.turbo",
"check-circular": "turbo run check-circular --cache-dir=.turbo",
"cicheck": "turbo run cicheck --cache-dir=.turbo && pnpm format",
"sst:dev": "sst dev",
Expand Down Expand Up @@ -53,8 +54,9 @@
"node": ">=18"
},
"dependencies": {
"bignumber.js": "^9.1.2",
"madge": "^6.1.0",
"typescript": "^5.3.3",
"viem": "^2.8.5"
"viem": "^2.9.3"
}
}
3 changes: 1 addition & 2 deletions packages/contracts-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"@summerfi/eslint-config": "workspace:*",
"@summerfi/hardhat-utils": "workspace:*",
"@summerfi/typescript-config": "workspace:*",
"hardhat": "^2.19.5",
"viem": "^2.7.8"
"hardhat": "^2.19.5"
}
}
1 change: 0 additions & 1 deletion packages/core-contracts/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
abis
cache

src/local.ts
Expand Down
10 changes: 5 additions & 5 deletions packages/core-contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
".": {
"import": "./src/index.ts",
"types": "./src/index.d.ts"
},
"./abis/*": {
"import": "./src/abis/*",
"types": "./src/abis/*"
}
},
"scripts": {
Expand Down Expand Up @@ -34,10 +38,6 @@
"@summerfi/typescript-config": "workspace:*",
"@summerfi/common": "workspace:*",
"@summerfi/jest-config": "workspace:*",
"@types/jest": "^29.5.11",
"dotenv": "^16.3.1",
"hardhat": "^2.19.5",
"jest": "^29.7.0",
"viem": "^2.7.1"
"hardhat": "^2.19.5"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
[
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "bytes32",
"name": "previousAdminRole",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "bytes32",
"name": "newAdminRole",
"type": "bytes32"
}
],
"name": "RoleAdminChanged",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "address",
"name": "account",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "sender",
"type": "address"
}
],
"name": "RoleGranted",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"indexed": true,
"internalType": "address",
"name": "account",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "sender",
"type": "address"
}
],
"name": "RoleRevoked",
"type": "event"
},
{
"inputs": [],
"name": "DEFAULT_ADMIN_ROLE",
"outputs": [
{
"internalType": "bytes32",
"name": "",
"type": "bytes32"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
}
],
"name": "getRoleAdmin",
"outputs": [
{
"internalType": "bytes32",
"name": "",
"type": "bytes32"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"internalType": "address",
"name": "account",
"type": "address"
}
],
"name": "grantRole",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"internalType": "address",
"name": "account",
"type": "address"
}
],
"name": "hasRole",
"outputs": [
{
"internalType": "bool",
"name": "",
"type": "bool"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"internalType": "address",
"name": "account",
"type": "address"
}
],
"name": "renounceRole",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "bytes32",
"name": "role",
"type": "bytes32"
},
{
"internalType": "address",
"name": "account",
"type": "address"
}
],
"name": "revokeRole",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "bytes4",
"name": "interfaceId",
"type": "bytes4"
}
],
"name": "supportsInterface",
"outputs": [
{
"internalType": "bool",
"name": "",
"type": "bool"
}
],
"stateMutability": "view",
"type": "function"
}
]
Loading

0 comments on commit d9ddcf0

Please sign in to comment.