Merge pull request #54 from onflow/nialexsan/dedup-defiactions

dedup defi actions

Author: nialexsan

.github/workflows/cadence_tests.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           token: ${{ secrets.GH_PAT }}
-          submodules: "true"
+          submodules: recursive
       - name: Set up Go
         uses: actions/setup-go@v3
         with:

.github/workflows/incrementfi_tests.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           token: ${{ secrets.GH_PAT }}
-          submodules: "true"
+          submodules: recursive
       - name: Install Flow CLI
         run: sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/master/install.sh)" -- v2.2.17
       - name: Flow CLI Version

.github/workflows/punchswap.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           token: ${{ secrets.GH_PAT }}
-          submodules: "recursive"
+          submodules: recursive
       - uses: actions/setup-go@v5
         with:
           go-version: "1.23.x"

.gitmodules

@@ -2,10 +2,6 @@
 	path = lib/TidalProtocol
 	url = git@github.com:onflow/TidalProtocol.git
 	branch = main
-[submodule "lib/DeFiActions"]
-	path = lib/DeFiActions
-	url = git@github.com:onflow/DeFiActions.git
-	branch = nialexsan/univ3
 [submodule "lib/flow-evm-gateway"]
 	path = lib/flow-evm-gateway
 	url = git@github.com:onflow/flow-evm-gateway.git

cadence/tests/test_helpers.cdc

@@ -28,31 +28,31 @@ access(all) fun deployContracts() {
     // DeFiActions contracts
     var err = Test.deployContract(
         name: "DeFiActionsUtils",
-        path: "../../lib/DeFiActions/cadence/contracts/utils/DeFiActionsUtils.cdc",
+        path: "../../lib/TidalProtocol/DeFiActions/cadence/contracts/utils/DeFiActionsUtils.cdc",
         arguments: []
     )
     Test.expect(err, Test.beNil())
     err = Test.deployContract(
         name: "DeFiActionsMathUtils",
-        path: "../../lib/DeFiActions/cadence/contracts/utils/DeFiActionsMathUtils.cdc",
+        path: "../../lib/TidalProtocol/DeFiActions/cadence/contracts/utils/DeFiActionsMathUtils.cdc",
         arguments: []
     )
     Test.expect(err, Test.beNil())
     err = Test.deployContract(
         name: "DeFiActions",
-        path: "../../lib/DeFiActions/cadence/contracts/interfaces/DeFiActions.cdc",
+        path: "../../lib/TidalProtocol/DeFiActions/cadence/contracts/interfaces/DeFiActions.cdc",
         arguments: []
     )
     Test.expect(err, Test.beNil())
     err = Test.deployContract(
         name: "SwapConnectors",
-        path: "../../lib/DeFiActions/cadence/contracts/connectors/SwapConnectors.cdc",
+        path: "../../lib/TidalProtocol/DeFiActions/cadence/contracts/connectors/SwapConnectors.cdc",
         arguments: []
     )
     Test.expect(err, Test.beNil())
     err = Test.deployContract(
         name: "FungibleTokenConnectors",
-        path: "../../lib/DeFiActions/cadence/contracts/connectors/FungibleTokenConnectors.cdc",
+        path: "../../lib/TidalProtocol/DeFiActions/cadence/contracts/connectors/FungibleTokenConnectors.cdc",
         arguments: []
     )
     Test.expect(err, Test.beNil())

flow.json

@@ -1,28 +1,28 @@
 {
 	"contracts": {
 		"DeFiActions": {
-			"source": "./lib/DeFiActions/cadence/contracts/interfaces/DeFiActions.cdc",
+			"source": "./lib/TidalProtocol/DeFiActions/cadence/contracts/interfaces/DeFiActions.cdc",
 			"aliases": {
 				"emulator": "f8d6e0586b0a20c7",
 				"testing": "0000000000000007"
 			}
 		},
 		"DeFiActionsMathUtils": {
-			"source": "./lib/DeFiActions/cadence/contracts/utils/DeFiActionsMathUtils.cdc",
+			"source": "./lib/TidalProtocol/DeFiActions/cadence/contracts/utils/DeFiActionsMathUtils.cdc",
 			"aliases": {
 				"emulator": "f8d6e0586b0a20c7",
 				"testing": "0000000000000007"
 			}
 		},
 		"DeFiActionsUtils": {
-			"source": "./lib/DeFiActions/cadence/contracts/utils/DeFiActionsUtils.cdc",
+			"source": "./lib/TidalProtocol/DeFiActions/cadence/contracts/utils/DeFiActionsUtils.cdc",
 			"aliases": {
 				"emulator": "f8d6e0586b0a20c7",
 				"testing": "0000000000000007"
 			}
 		},
 		"FungibleTokenConnectors": {
-			"source": "./lib/DeFiActions/cadence/contracts/connectors/FungibleTokenConnectors.cdc",
+			"source": "./lib/TidalProtocol/DeFiActions/cadence/contracts/connectors/FungibleTokenConnectors.cdc",
 			"aliases": {
 				"emulator": "f8d6e0586b0a20c7",
 				"testing": "0000000000000007"
@@ -64,7 +64,7 @@
 			}
 		},
 		"SwapConnectors": {
-			"source": "./lib/DeFiActions/cadence/contracts/connectors/SwapConnectors.cdc",
+			"source": "./lib/TidalProtocol/DeFiActions/cadence/contracts/connectors/SwapConnectors.cdc",
 			"aliases": {
 				"emulator": "f8d6e0586b0a20c7",
 				"testing": "0000000000000007"
@@ -333,4 +333,4 @@
 			]
 		}
 	}
-}
+}

lib/DeFiActions

@@ -32,7 +32,7 @@ flow transactions send ./cadence/transactions/mocks/incrementfi/transfer_amm_tok
 # 
 # 4. create swap pair
 #
-flow transactions send ./lib/DeFiActions/cadence/transactions/increment-fi/create_swap_pair.cdc $MOET_IDENTIFIER $YIELD_IDENTIFIER false
+flow transactions send ./lib/TidalProtocol/DeFiActions/cadence/transactions/increment-fi/create_swap_pair.cdc $MOET_IDENTIFIER $YIELD_IDENTIFIER false
 #
 #
 # 5. add liquidity to the AMMs
@@ -45,7 +45,7 @@ DEADLINE=$((BLOCK_TS + 600))
 echo $MOET_KEY
 echo $YIELD_KEY
 echo $DEADLINE
-flow transactions send "./lib/DeFiActions/cadence/transactions/increment-fi/add_liquidity.cdc" \
+flow transactions send "./lib/TidalProtocol/DeFiActions/cadence/transactions/increment-fi/add_liquidity.cdc" \
 	"$MOET_KEY" \
 	"$YIELD_KEY" \
 	100.0 \