address PR comments

Author: nialexsan

.github/workflows/incrementfi_tests.yml

@@ -29,5 +29,7 @@ jobs:
         run: ./local/setup_wallets.sh
       - name: Install Flow deps
         run: flow deps install
+      - name: Deploy contracts
+        run: flow deploy
       - name: Setup IncrementFi
         run: ./local/incrementfi/setup_incrementfi.sh

cadence/transactions/mocks/incrementfi/create_pair.cdc

@@ -21,13 +21,6 @@
 				"testing": "0000000000000007"
 			}
 		},
-		"DeFiActionsUtils": {
-			"source": "./lib/DeFiActions/cadence/contracts/utils/DeFiActionsUtils.cdc",
-			"aliases": {
-				"emulator": "f8d6e0586b0a20c7",
-				"testing": "0000000000000007"
-			}
-		},
 		"FungibleTokenConnectors": {
 			"source": "./lib/DeFiActions/cadence/contracts/connectors/FungibleTokenConnectors.cdc",
 			"aliases": {
@@ -290,22 +283,6 @@
 	},
 	"deployments": {
 		"emulator": {
-			"mock-incrementfi": [
-				"SwapConfig",
-				"SwapInterfaces",
-				"SwapError",
-				{
-					"name": "SwapFactory",
-					"args": [
-						{
-							"value": "0xf3fcd2c1a78f5eee",
-							"type": "Address"
-						}
-					]
-				},
-				"StableSwapFactory",
-				"SwapRouter"
-			],
 			"emulator-account": [
 				"DeFiActionsMathUtils",
 				"DeFiActionsUtils",
@@ -345,7 +322,23 @@
 				"TidalYieldAutoBalancers",
 				"TidalYield",
 				"TidalYieldStrategies"
+			],
+			"mock-incrementfi": [
+				"SwapConfig",
+				"SwapInterfaces",
+				"SwapError",
+				{
+					"name": "SwapFactory",
+					"args": [
+						{
+							"value": "0xf3fcd2c1a78f5eee",
+							"type": "Address"
+						}
+					]
+				},
+				"StableSwapFactory",
+				"SwapRouter"
 			]
 		}
 	}
-}
+}

cadence/transactions/mocks/incrementfi/setup.cdc

@@ -3,8 +3,6 @@
 TEMPLATE="./cadence/contracts/mocks/incrementfi/SwapPairTemplate.cdc"
 OUTPUT="./cadence/contracts/mocks/incrementfi/SwapPair.cdc"
 
-TX="./cadence/transactions/mocks/incrementfi/setup.cdc"
-
 jq -r '
   (.contracts, .dependencies)
   | to_entries[]
@@ -15,10 +13,9 @@ jq -r '
 cp "$TEMPLATE" "$OUTPUT"
 
 while read name address; do
-	sed -i '' -E "s|^[[:space:]]*import[[:space:]]+\"${name}\"[[:space:]]*;?[[:space:]]*$|import ${name} from ${address}|g" "$OUTPUT"
+  sed -i '' -E "s|^[[:space:]]*import[[:space:]]+\"${name}\"[[:space:]]*;?[[:space:]]*$|import ${name} from ${address}|g" "$OUTPUT"
 done < contracts_map.txt
 
-HEX_STRING=$(xxd -p "$OUTPUT" | tr -d '\n')
-
-sed -i '' -E "s|^[[:space:]]*let swapPairTemplateCode[[:space:]]*=[[:space:]]*\"[^\"]*\"|        let swapPairTemplateCode = \"${HEX_STRING}\"|" $TX
+# Generate hex string
+xxd -p "$OUTPUT" | tr -d '\n'
 

flow.json

@@ -20,7 +20,11 @@ flow transactions send "./cadence/transactions/flow-token/transfer_flow.cdc" 0xf
 MOET_IDENTIFIER=$(flow scripts execute ./cadence/scripts/mocks/incrementfi/get_moet_token_identifier.cdc | grep "^Result:" | sed -E 's/Result: "([^"]+)"/\1/')
 YIELD_IDENTIFIER=$(flow scripts execute ./cadence/scripts/mocks/incrementfi/get_yield_token_identifier.cdc | grep "^Result:" | sed -E 's/Result: "([^"]+)"/\1/')
 
-flow transactions send ./cadence/transactions/mocks/incrementfi/setup.cdc --signer ${SIGNER}
+
+SWAP_PAIR_HEX=$(./local/incrementfi/generate-swap-pair-tx.sh)
+
+flow transactions send ./cadence/transactions/mocks/incrementfi/setup.cdc ${SWAP_PAIR_HEX} --signer ${SIGNER}
+
 #
 # 3. transfer funds to FLOW, MOET, and YIELD vaults
 #

local/incrementfi/generate-swap-pair-tx.sh

@@ -7,3 +7,4 @@ flow accounts create --network "$FLOW_NETWORK" --key "$(cat $AMM_PUBKEY_PATH)"
 flow accounts create --network "$FLOW_NETWORK" --key "$(cat $EVM_GATEWAY_PUBKEY_PATH)"
 
 flow transactions send ./cadence/transactions/mocks/add_gw_keys.cdc --signer evm-gateway
+