Add ecp inference

build/parameters.json

@@ -16,7 +16,11 @@
       "sequencer_contract": "0xE0a88F1fA56D8a8D73E9bb9Fc03506439cb386Bd",
       "edge_task_payment": "0xa07829335024918c0626968c5e93910f90de1dd7",
       "edge_task_payment_created": 2569302,
-      "edge_url": "https://edge-api.swanchain.io/v1"
+      "edge_url": "https://edge-api.swanchain.io/v1",
+
+      "token_ubi_zero_contract": "0x39cBBeaF88a91404618d45a16e0977Adab4d1Af1",
+      "orchestrator_collateral_ubi_zero_contract": "0x643A820060c78D9122081aafF0C039b070937558",
+      "zk_collateral_ubi_zero_contract": "0x7A099B665e760BCCF3Aa0cBbb66C8da47F13C03d"
     }
   },
   {
@@ -36,7 +40,10 @@
       "sequencer_contract": "0x3ec53c3db17a9b7a50967100f9e0b9e1c910c7d4",
       "edge_task_payment": "0x114fd9a28fbbf687e4232e54d73e5449628d3219",
       "edge_task_payment_created": 9084245,
-      "edge_url": "https://edge-testnet.swanchain.io/v1"
+      "edge_url": "https://edge-testnet.swanchain.io/v1",
+      "orchestrator_collateral_ubi_zero_contract": "0xd5716082058871755ca9202838e35f51dFa816D2",
+      "zk_collateral_ubi_zero_contract": "0x9584eC8C86A32963Cb36B135c2e58837e2e46d4b"
+
     }
   }
 

build/version.go

@@ -17,6 +17,7 @@ const UBITaskImageIntelGpu = "filswan/ubi-worker-gpu-intel:latest"
 const UBITaskImageAmdCpu = "filswan/ubi-worker-cpu-amd:latest"
 const UBITaskImageAmdGpu = "filswan/ubi-worker-gpu-amd:latest"
 const UBIResourceExporterDockerImage = "filswan/resource-exporter:v11.3.0"
+const TraefikServerDockerImage = "traefik:v2.10"
 
 func UserVersion() string {
 	return BuildVersion + "+" + NetWorkTag + CurrentCommit
@@ -37,20 +38,22 @@ func LoadParam() []NetworkConfig {
 type NetworkConfig struct {
 	Network string `json:"network"`
 	Config  struct {
-		SequencerUrl                   string `json:"sequencer_url"`
-		ZkEnginePk                     string `json:"zk_engine_pk"`
-		OrchestratorPk                 string `json:"orchestrator_pk"`
-		ChainRpc                       string `json:"chain_rpc"`
-		SwanTokenContract              string `json:"swan_token_contract"`
-		OrchestratorCollateralContract string `json:"orchestrator_collateral_contract"`
-		JobManagerContract             string `json:"job_manager_contract"`
-		JobManagerContractCreated      uint64 `json:"job_manager_contract_created"`
-		RegisterCpContract             string `json:"register_cp_contract"`
-		ZkCollateralContract           string `json:"zk_collateral_contract"`
-		RegisterTaskContract           string `json:"register_task_contract"`
-		SequencerContract              string `json:"sequencer_contract"`
-		EdgeUrl                        string `json:"edge_url"`
-		EdgeTaskPayment                string `json:"edge_task_payment"`
-		EdgeTaskPaymentCreated         int64  `json:"edge_task_payment_created"`
+		SequencerUrl                          string `json:"sequencer_url"`
+		ZkEnginePk                            string `json:"zk_engine_pk"`
+		OrchestratorPk                        string `json:"orchestrator_pk"`
+		ChainRpc                              string `json:"chain_rpc"`
+		SwanTokenContract                     string `json:"swan_token_contract"`
+		OrchestratorCollateralContract        string `json:"orchestrator_collateral_contract"`
+		OrchestratorCollateralUbiZeroContract string `json:"orchestrator_collateral_ubi_zero_contract"`
+		JobManagerContract                    string `json:"job_manager_contract"`
+		JobManagerContractCreated             uint64 `json:"job_manager_contract_created"`
+		RegisterCpContract                    string `json:"register_cp_contract"`
+		ZkCollateralContract                  string `json:"zk_collateral_contract"`
+		ZkCollateralUbiZeroContract           string `json:"zk_collateral_ubi_zero_contract"`
+		RegisterTaskContract                  string `json:"register_task_contract"`
+		SequencerContract                     string `json:"sequencer_contract"`
+		EdgeUrl                               string `json:"edge_url"`
+		EdgeTaskPayment                       string `json:"edge_task_payment"`
+		EdgeTaskPaymentCreated                int64  `json:"edge_task_payment_created"`
 	} `json:"config"`
 }

cmd/computing-provider/main.go

@@ -45,6 +45,7 @@ func main() {
 			contractCmd,
 			priceCmd,
 			networkCmd,
+			ubiZeroCmd,
 		},
 		Before: func(c *cli.Context) error {
 			cpRepoPath, err := homedir.Expand(c.String(FlagRepo.Name))

cmd/computing-provider/network-policy.yaml

@@ -5,7 +5,7 @@ $NETWORK_SET
 apiVersion: projectcalico.org/v3
 kind: GlobalNetworkPolicy
 metadata:
-  name: $G_SUBNET_NAME
+  name: $G_NETWORK_NAME
 spec:
   order: 201
   namespaceSelector: has(projectcalico.org/name) && projectcalico.org/name not in {"kube-system", "calico-system", "calico-apiserver","ingress-nginx"}

cmd/computing-provider/network.go

@@ -79,7 +79,8 @@ var generateNetworkCmd = &cli.Command{
 		filePath := filepath.Join(cpRepoPath, "network-policy.yaml")
 		if _, err := os.Stat(filePath); err != nil {
 			networkPolicyContent = strings.ReplaceAll(networkPolicyContent, "$NETWORK_SET", string(networkSetBytes))
-			networkPolicyContent = strings.ReplaceAll(networkPolicyContent, "$G_SUBNET_NAME", models.NetworkGlobalSubnet)
+			networkPolicyContent = strings.ReplaceAll(networkPolicyContent, "$G_NETWORK_NAME", models.NetworkGlobalSubnet)
+			networkPolicyContent = strings.ReplaceAll(networkPolicyContent, "$G_SUBNET_NAME", models.NetworkNetset)
 			networkPolicyContent = strings.ReplaceAll(networkPolicyContent, "$G_OUT_NAME", models.NetworkGlobalOutAccess)
 			networkPolicyContent = strings.ReplaceAll(networkPolicyContent, "$G_IN_NAME", models.NetworkGlobalInAccess)
 			networkPolicyContent = strings.ReplaceAll(networkPolicyContent, "$G_NS_NAME", models.NetworkGlobalNamespace)