Update "Deploy Linked Token" GH action to support Proxy upgrade pattern

.github/workflows/auto-deploy-contracts.yaml

@@ -45,9 +45,6 @@ jobs:
       - name: Checkout the branch that triggered this run
         uses: actions/checkout@v4
         with:
-          # TODO(jie): After switch to workflow_dispatch only, we should use ref_name.
-          # head_ref only works for workflow triggered by pull requests.
-          # ref: ${{ github.ref_name }}
           ref: ${{ github.head_ref }}
           submodules: recursive
 

.github/workflows/deploy-linked-token-to-dedicated-host.yaml

@@ -0,0 +1,44 @@
+name: Deploy LinkedToken contracts to dedicated host running IPC subnet
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+    paths:
+      - contracts/**
+
+concurrency:
+  # Only allow one run at a time for this workflow
+  group: deploy-linked-token-to-dedicated-host
+  cancel-in-progress: true
+
+jobs:
+  deploy-subnet-to-dedicated-host:
+    uses: ./.github/workflows/deploy-subnet-to-dedicated-host.yaml
+    secrets: inherit
+  deploy-linked-token-to-dedicated-host:
+    runs-on: ubuntu-latest
+    needs: [deploy-subnet-to-dedicated-host]
+    steps:
+      - name: Checkout code repo
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+      - name: Copy deployment script files to the host
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.DEDICATED_SERVER_IP_ADDRESS }}
+          username: ubuntu
+          key: ${{ secrets.DEDICATED_SERVER_PRIVATE_KEY }}
+          source: "scripts/deploy_linked_token_to_subnet.sh"
+          target: "/home/ubuntu"
+      - name: Run deploy scripts on the host
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.DEDICATED_SERVER_IP_ADDRESS }}
+          username: ubuntu
+          key: ${{ secrets.DEDICATED_SERVER_PRIVATE_KEY }}
+          script: bash -il /home/ubuntu/scripts/deploy_linked_token_to_subnet.sh ${{ github.head_ref }}
+          command_timeout: 40m

.github/workflows/deploy-to-dedicated-host.yaml → .github/workflows/deploy-subnet-to-dedicated-host.yaml

@@ -2,20 +2,21 @@ name: Deploy to calibration net on a dedicated server
 
 on:
   workflow_dispatch:
+  workflow_call:
 
 concurrency:
   # Only allow one run at a time for this workflow
-  group: deploy-to-dedicated-host
+  group: deploy-subnet-to-dedicated-host
   cancel-in-progress: true
 
 jobs:
-  deploy_to_dedicated_host:
+  deploy-subnet-to-dedicated-host:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code repo
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.ref_name }}
+          ref: ${{ github.head_ref }}
       - name: Copy deployment script files to the host
         uses: appleboy/[email protected]
         with:
@@ -38,7 +39,7 @@ jobs:
           host: ${{ secrets.DEDICATED_SERVER_IP_ADDRESS }}
           username: ubuntu
           key: ${{ secrets.DEDICATED_SERVER_PRIVATE_KEY }}
-          script: rm -rf /home/ubuntu/.ipc && cp -r /home/ubuntu/scripts/deploy_subnet_under_calibration_net/.ipc /home/ubuntu/
+          script: rm -vrf /home/ubuntu/.ipc && cp -r /home/ubuntu/scripts/deploy_subnet_under_calibration_net/.ipc /home/ubuntu/
       - name: Create wallet file locally
         run: |
           echo '${{ secrets.CI_TEST_WALLET_JSON }}' > evm_keystore.json
@@ -56,5 +57,5 @@ jobs:
           host: ${{ secrets.DEDICATED_SERVER_IP_ADDRESS }}
           username: ubuntu
           key: ${{ secrets.DEDICATED_SERVER_PRIVATE_KEY }}
-          script: bash -il /home/ubuntu/scripts/deploy_subnet_under_calibration_net/deploy.sh ${{ github.ref_name }}
+          script: bash -il /home/ubuntu/scripts/deploy_subnet_under_calibration_net/deploy.sh ${{ github.head_ref }}
           command_timeout: 50m

extras/linked-token/test/LinkedTokenController.t.sol

@@ -15,7 +15,6 @@ import {IpcEnvelope, CallMsg, IpcMsgKind} from "@ipc/src/structs/CrossNet.sol";
 
 import {SubnetActorDiamond} from "@ipc/src/SubnetActorDiamond.sol";
 import {LinkedTokenController} from "../src/LinkedTokenController.sol";
-//import {InvalidOriginContract, InvalidOriginSubnet} from "../src/@ipc/src/examples/cross-token/IpcCrossTokenErrors.sol";
 import {USDCTest} from "../src/USDCTest.sol";
 
 import "openzeppelin-contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

extras/linked-token/test/LinkedTokenReplica.t.sol

@@ -14,7 +14,6 @@ import {IpcEnvelope, CallMsg, IpcMsgKind} from "@ipc/src/structs/CrossNet.sol";
 
 import {SubnetActorDiamond} from "@ipc/src/SubnetActorDiamond.sol";
 import {LinkedTokenController} from "../src/LinkedTokenController.sol";
-//import {InvalidOriginContract, InvalidOriginSubnet} from "@ipc/src/examples/cross-token/IpcCrossTokenErrors.sol";
 import {USDCTest} from "../src/USDCTest.sol";
 import {InvalidOriginContract, InvalidOriginSubnet} from "../src/LinkedToken.sol";
 

extras/tools/fvm-eth-address-converter/.gitignore

@@ -0,0 +1 @@
+node_modules

extras/tools/fvm-eth-address-converter/fvm-addr-to-eth-addr.ts

@@ -0,0 +1,11 @@
+import { ethAddressFromDelegated } from '@glif/filecoin-address'
+
+if (process.argv.length != 3) {
+    console.log('Usage: npx ts-node fvm-addr-to-eth-addr.ts <fvm_address>')
+    process.exit(1)
+}
+
+const fvmAddress = process.argv[2]
+const ethAddress: string = ethAddressFromDelegated(fvmAddress)
+
+console.log(ethAddress)