update contract script

Author: RnkSngh

script/demoScripts/demoPolymer.sh

@@ -98,8 +98,6 @@ if echo "$ROUTES_RESPONSE" | grep -q "error"; then
   exit 1
 fi
 
-echo response gotten: $ROUTES_RESPONSE
-
 # Extract the first route and its first step
 FIRST_STEP=$(echo "$ROUTES_RESPONSE" | jq -r '.routes[1].steps[0]')
 
@@ -137,8 +135,6 @@ fi
 echo "✓ Transaction calldata retrieved successfully"
 echo ""
 
-echo $STEP_TX_RESPONSE
-
 # Extract transaction details
 TX_TO=$(echo "$STEP_TX_RESPONSE" | jq -r '.transactionRequest.to')
 TX_DATA=$(echo "$STEP_TX_RESPONSE" | jq -r '.transactionRequest.data')
@@ -155,12 +151,16 @@ echo "  Approval Amount: $APPROVAL_AMOUNT (Bridge Amount: $FROM_AMOUNT )"
 echo "  Spender: $TX_TO"
 echo ""
 
-APPROVE_TX_HASH=$(cast send "$FROM_TOKEN" \
+APPROVE_TX_OUTPUT=$(cast send "$FROM_TOKEN" \
   "approve(address,uint256)(bool)" \
   "$TX_TO" \
   "$APPROVAL_AMOUNT" \
   --private-key "$PRIVATE_KEY" \
-  --rpc-url "$FROM_RPC_URL" | grep "transactionHash" | awk '{print $2}')
+  --rpc-url "$FROM_RPC_URL" \
+  --json)
+
+APPROVE_TX_HASH=$(echo "$APPROVE_TX_OUTPUT" | jq -r '.transactionHash')
+echo Approve tx hash: $APPROVE_TX_HASH
 
 if [ -z "$APPROVE_TX_HASH" ]; then
   echo "Error: Approval transaction failed"
@@ -172,7 +172,7 @@ echo "Approval Transaction Hash: $APPROVE_TX_HASH"
 echo ""
 
 
-echo "Sleeping to avoid nonce/tx replacement issues"
+echo "Sleeping to avoid nonce/tx replacement issues ..."
 sleep 4 
 
 # Step 3: Submit the transaction
@@ -181,11 +181,15 @@ echo "To Address:  $TX_TO"
 echo "Gas Limit:   $TX_GAS_LIMIT"
 echo ""
 
-TX_HASH=$(cast send "$TX_TO" \
+TX_OUTPUT=$(cast send "$TX_TO" \
   --private-key "$PRIVATE_KEY" \
   --gas-limit "$TX_GAS_LIMIT" \
   --rpc-url "$FROM_RPC_URL" \
-  "$TX_DATA" | grep "transactionHash" | awk '{print $2}')
+  --json \
+  "$TX_DATA")
+
+TX_HASH=$(echo "$TX_OUTPUT" | jq -r '.transactionHash')
+echo Burn tx hash: $TX_HASH
 
 if [ -z "$TX_HASH" ]; then
   echo "Error: Transaction submission failed"
@@ -213,7 +217,7 @@ echo "✓ Transaction mined successfully"
 echo ""
 
 # Step 4: Monitor CCTP transfer status
-echo "Step 4: Monitoring CCTP transfer status..."
+echo "Step 4: Monitoring CCTP transfer status at url " "${API_URL}/v1/status/${TX_HASH}"
 MAX_RETRIES=60
 RETRY_INTERVAL=10
 RETRY_COUNT=0

src/Facets/PolymerCCTPFacet.sol

@@ -65,16 +65,16 @@ contract PolymerCCTPFacet is IPolymerCCTPFacet, ILiFi, ReentrancyGuard, SwapperV
         }
 
         // TODO: Do we need this check if it's always going to be usdc?
-        LibAsset.depositAsset(_bridgeData.sendingAssetId, _bridgeData.minAmount -  _polymerData.polymerTokenFee );
-        LibAsset.transferFromERC20( usdc,  msg.sender, polymerFeeReceiver, _polymerData.polymerTokenFee );
+        LibAsset.depositAsset(_bridgeData.sendingAssetId, _bridgeData.minAmount );
+        LibAsset.transferERC20( usdc,  polymerFeeReceiver, _polymerData.polymerTokenFee );
 
 
         // TODO we don't need to use safe approve here?
-        IERC20(usdc).approve(address(tokenMessenger), _bridgeData.minAmount);
+        IERC20(usdc).approve(address(tokenMessenger), _bridgeData.minAmount -  _polymerData.polymerTokenFee );
 
         // Need tocheck: can we just use destinationChainID as the normal chain id? and can we just mpass in min Amount as the amountT?
         tokenMessenger.depositForBurn(
-            _bridgeData.minAmount,
+            _bridgeData.minAmount -  _polymerData.polymerTokenFee ,
             uint32(_bridgeData.destinationChainId),
             _bridgeData.receiver == NON_EVM_ADDRESS
                 ? _polymerData.nonEvmAddress
@@ -97,7 +97,7 @@ contract PolymerCCTPFacet is IPolymerCCTPFacet, ILiFi, ReentrancyGuard, SwapperV
                 _bridgeData.referrer,
                 _bridgeData.sendingAssetId,
                 _bridgeData.receiver,
-                _bridgeData.minAmount,
+                _bridgeData.minAmount - _polymerData.polymerTokenFee,
                 _bridgeData.destinationChainId,
                 _bridgeData.hasSourceSwaps,
                 _bridgeData.hasDestinationCall

testnet-addresses.json

@@ -3,18 +3,18 @@
     "usdc": "0x5fd84259d66Cd46123540766Be93DFE6D43130D7",
     "polymerFeeRecipient": "0x81b5c1c0343ff0087C04F543D0f36dC4745b999F",
     "tokenMessenger": "0x8FE6B999Dc680CcFDD5Bf7EB0974218be2542DAA",
-    "diamondProxy": "0xF58AAe05E206AB0eA2D40eEdCC99E532b7d0c442"
+    "diamondProxy": "0x4d09Dd99652e20E6795D08d25ecC03e9600836a4"
   },
   "421614": {
     "usdc": "0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d",
     "polymerFeeRecipient": "0x81b5c1c0343ff0087C04F543D0f36dC4745b999F",
     "tokenMessenger": "0x8FE6B999Dc680CcFDD5Bf7EB0974218be2542DAA",
-    "diamondProxy": "0x59730C6CB629E30845B5FEb0236c4532A236777C"
+    "diamondProxy": "0x06B90798BAc18a7927e62a194523131502560911"
   },
   "84532": {
     "usdc": "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
     "polymerFeeRecipient": "0x81b5c1c0343ff0087C04F543D0f36dC4745b999F",
     "tokenMessenger": "0x8FE6B999Dc680CcFDD5Bf7EB0974218be2542DAA",
-    "diamondProxy": "0x1C82E77c4Fe9cEA32aF1591D06cc20e4539026b7"
+    "diamondProxy": "0x4a0258A6627e9D8cef54B52Bde9814B13570Cbb7"
   }
 }