Skip to content

Commit da381a5

Browse files
committed
Fix dependencies
1 parent dfb1168 commit da381a5

3 files changed

Lines changed: 22 additions & 25 deletions

File tree

internal/super/generator/templates/README_defi_actions.md.tmpl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ flow project deploy --network emulator
5555
```
5656

5757
This deploys all required contracts to the emulator:
58-
- `DeFiActionsMathUtils` - Math utilities for DeFi Actions
5958
- `DeFiActionsUtils` - Helper utilities for DeFi Actions
6059
- `DeFiActions` - Core DeFi Actions framework
6160
- `ExampleConnectors` - Your TokenSink connector
@@ -86,7 +85,7 @@ flow test cadence/tests/ExampleConnectors_test.cdc
8685
```
8786

8887
This test runs in the Cadence Testing Framework and manually:
89-
1. Deploys all DeFi Actions dependencies (`DeFiActionsMathUtils`, `DeFiActionsUtils`, `DeFiActions`)
88+
1. Deploys all DeFi Actions dependencies (`DeFiActionsUtils`, `DeFiActions`)
9089
2. Deploys the `ExampleConnectors` contract
9190
3. Executes the `DepositViaSink` transaction
9291
4. Verifies tokens are deposited successfully
@@ -135,7 +134,6 @@ This project includes the following dependencies (already installed):
135134
**DeFi Actions Framework:**
136135
- `DeFiActions` - Core framework for composable DeFi connectors
137136
- `DeFiActionsUtils` - Helper utilities
138-
- `DeFiActionsMathUtils` - Math utilities for DeFi operations
139137

140138
**DeFi Protocol Dependencies:**
141139
- `stFlowToken` - Liquid staking token (used in fork test example)

internal/super/generator/templates/contract_example_connectors_test.cdc.tmpl

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,18 @@ access(all) let recipient = Test.createAccount()
99

1010
access(all) fun setup() {
1111
// Deploy DeFi Actions dependencies first
12+
// Note: The Cadence Test Framework requires manual deployment of dependencies
13+
// unless used in Fork Testing mode.
1214
var err = Test.deployContract(
13-
name: "DeFiActionsMathUtils",
14-
path: "../../imports/92195d814edf9cb0/DeFiActionsMathUtils.cdc",
15-
arguments: []
16-
)
17-
Test.expect(err, Test.beNil())
18-
19-
err = Test.deployContract(
2015
name: "DeFiActionsUtils",
21-
path: "../../imports/92195d814edf9cb0/DeFiActionsUtils.cdc",
16+
path: "../../imports/6d888f175c158410/DeFiActionsUtils.cdc",
2217
arguments: []
2318
)
2419
Test.expect(err, Test.beNil())
2520

2621
err = Test.deployContract(
2722
name: "DeFiActions",
28-
path: "../../imports/92195d814edf9cb0/DeFiActions.cdc",
23+
path: "../../imports/6d888f175c158410/DeFiActions.cdc",
2924
arguments: []
3025
)
3126
Test.expect(err, Test.beNil())

internal/super/projecttypes.go

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,19 @@ func getProjectTypeConfigs() map[ProjectType]*ProjectTypeConfig {
123123
Description: "DeFi Actions project (build composable DeFi connectors)",
124124
CoreContracts: []string{"FungibleToken", "FlowToken"},
125125
CustomDependencies: []flowkitConfig.Dependency{
126+
{
127+
Name: "DeFiActionsUtils",
128+
Source: flowkitConfig.Source{
129+
NetworkName: flowkitConfig.MainnetNetwork.Name,
130+
Address: flowsdk.HexToAddress("6d888f175c158410"),
131+
ContractName: "DeFiActionsUtils",
132+
},
133+
Aliases: flowkitConfig.Aliases{
134+
{Network: "mainnet", Address: flowsdk.HexToAddress("6d888f175c158410")},
135+
{Network: "testnet", Address: flowsdk.HexToAddress("0b11b1848a8aa2c0")},
136+
{Network: "testing", Address: flowsdk.HexToAddress("0000000000000007")},
137+
},
138+
},
126139
{
127140
Name: "DeFiActions",
128141
Source: flowkitConfig.Source{
@@ -131,18 +144,9 @@ func getProjectTypeConfigs() map[ProjectType]*ProjectTypeConfig {
131144
ContractName: "DeFiActions",
132145
},
133146
Aliases: flowkitConfig.Aliases{
134-
{
135-
Network: "mainnet",
136-
Address: flowsdk.HexToAddress("6d888f175c158410"),
137-
},
138-
{
139-
Network: "testnet",
140-
Address: flowsdk.HexToAddress("0b11b1848a8aa2c0"),
141-
},
142-
{
143-
Network: "testing",
144-
Address: flowsdk.HexToAddress("0000000000000006"),
145-
},
147+
{Network: "mainnet", Address: flowsdk.HexToAddress("6d888f175c158410")},
148+
{Network: "testnet", Address: flowsdk.HexToAddress("0b11b1848a8aa2c0")},
149+
{Network: "testing", Address: flowsdk.HexToAddress("0000000000000007")},
146150
},
147151
},
148152
{
@@ -185,7 +189,7 @@ func getProjectTypeConfigs() map[ProjectType]*ProjectTypeConfig {
185189
},
186190
},
187191
},
188-
ContractNames: []string{"DeFiActionsMathUtils", "DeFiActionsUtils", "DeFiActions", "ExampleConnectors"},
192+
ContractNames: []string{"ExampleConnectors"},
189193
DeploymentAccount: "emulator-account",
190194
},
191195
ProjectTypeCustom: {

0 commit comments

Comments
 (0)