Skip to content

Commit 6936033

Browse files
authored
Merge branch 'dev' into add-v1.4.0
2 parents 3089a67 + 3de54c3 commit 6936033

File tree

4 files changed

+3
-46
lines changed

4 files changed

+3
-46
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,11 @@ jobs:
1919
- name: Install Foundry
2020
uses: foundry-rs/foundry-toolchain@v1
2121

22-
- name: Checkout submodules
23-
env:
24-
SSH_KEY_SPARK_ADDRESS_REGISTRY_PRIVATE: ${{secrets.SSH_KEY_SPARK_ADDRESS_REGISTRY_PRIVATE}}
25-
shell: bash
26-
run: |
27-
chmod +x ./install-submodules.sh
28-
./install-submodules.sh
29-
3022
- name: Build contracts
3123
run: |
3224
forge --version
3325
forge build --sizes
3426
35-
3627
test:
3728
runs-on: ubuntu-latest
3829
steps:
@@ -41,14 +32,6 @@ jobs:
4132
- name: Install Foundry
4233
uses: foundry-rs/foundry-toolchain@v1
4334

44-
- name: Checkout submodules
45-
env:
46-
SSH_KEY_SPARK_ADDRESS_REGISTRY_PRIVATE: ${{secrets.SSH_KEY_SPARK_ADDRESS_REGISTRY_PRIVATE}}
47-
shell: bash
48-
run: |
49-
chmod +x ./install-submodules.sh
50-
./install-submodules.sh
51-
5235
- name: Run tests
5336
env:
5437
MAINNET_RPC_URL: ${{secrets.MAINNET_RPC_URL}}
@@ -67,14 +50,6 @@ jobs:
6750
- name: Install Foundry
6851
uses: foundry-rs/foundry-toolchain@v1
6952

70-
- name: Checkout submodules
71-
env:
72-
SSH_KEY_SPARK_ADDRESS_REGISTRY_PRIVATE: ${{secrets.SSH_KEY_SPARK_ADDRESS_REGISTRY_PRIVATE}}
73-
shell: bash
74-
run: |
75-
chmod +x ./install-submodules.sh
76-
./install-submodules.sh
77-
7853
- name: Run coverage
7954
env:
8055
MAINNET_RPC_URL: ${{secrets.MAINNET_RPC_URL}}

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@
3333
url = https://github.com/aave-dao/aave-v3-origin
3434
[submodule "lib/spark-address-registry"]
3535
path = lib/spark-address-registry
36-
url = git@github.com:marsfoundation/spark-address-registry-private.git
36+
url = https://github.com/sparkdotfi/spark-address-registry

install-submodules.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

script/staging/test/StagingDeployment.t.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ contract StagingDeploymentTestBase is Test {
111111
vm.setEnv("FOUNDRY_ROOT_CHAINID", "1");
112112

113113
// Domains and bridge
114-
mainnet = getChain("mainnet").createSelectFork();
115-
base = getChain("base").createFork();
114+
mainnet = getChain("mainnet").createSelectFork(21600000); // Jan 11, 2025
115+
base = getChain("base").createFork(24900000); // Jan 11, 2025
116116
cctpBridge = CCTPBridgeTesting.createCircleBridge(mainnet, base);
117117

118118
// JSON data

0 commit comments

Comments
 (0)