Explorar o código

fix devnet GS upgrade path

commit-id:3a2fa5aa
justinschuldt %!s(int64=3) %!d(string=hai) anos
pai
achega
99a02a41ea
Modificáronse 2 ficheiros con 11 adicións e 6 borrados
  1. 1 0
      node/cmd/guardiand/admintemplate.go
  2. 10 6
      scripts/test-injection.sh

+ 1 - 0
node/cmd/guardiand/admintemplate.go

@@ -38,6 +38,7 @@ func init() {
 	templateGuardianIndex = TemplateCmd.PersistentFlags().Int("idx", 1, "Default current guardian set index")
 	templateGuardianIndex = TemplateCmd.PersistentFlags().Int("idx", 1, "Default current guardian set index")
 
 
 	setUpdateNumGuardians = AdminClientGuardianSetTemplateCmd.Flags().Int("num", 1, "Number of devnet guardians in example file")
 	setUpdateNumGuardians = AdminClientGuardianSetTemplateCmd.Flags().Int("num", 1, "Number of devnet guardians in example file")
+	TemplateCmd.AddCommand(AdminClientGuardianSetTemplateCmd)
 
 
 	AdminClientContractUpgradeTemplateCmd.Flags().AddFlagSet(governanceFlagSet)
 	AdminClientContractUpgradeTemplateCmd.Flags().AddFlagSet(governanceFlagSet)
 	TemplateCmd.AddCommand(AdminClientContractUpgradeTemplateCmd)
 	TemplateCmd.AddCommand(AdminClientContractUpgradeTemplateCmd)

+ 10 - 6
scripts/test-injection.sh

@@ -5,14 +5,18 @@ set -e
 
 
 node=$1
 node=$1
 idx=$2
 idx=$2
-path=/tmp/new-guardianset.prototxt
+localPath=./scripts/new-guardianset.prototxt
+containerPath=/tmp/new-guardianset.prototxt
 sock=/tmp/admin.sock
 sock=/tmp/admin.sock
 
 
-# Create a no-op update that sets the same 1-node guardian set again.
-kubectl exec -n wormhole guardian-${node} -c guardiand -- /guardiand template guardian-set-update --num=1 --idx=${idx} $path
+# Create a guardian set update VAA, pipe stdout to a local file.
+kubectl exec -n wormhole guardian-${node} -c guardiand -- /guardiand template guardian-set-update --num=1 --idx=${idx} > ${localPath}
 
 
-# Verify and print resulting result. The digest incorporates the current time and is NOT deterministic.
-kubectl exec -n wormhole guardian-${node} -c guardiand -- /guardiand admin governance-vaa-verify $path
+# Copy the local VAA prototext to a pod's file system.
+kubectl cp ${localPath} wormhole/guardian-${node}:${containerPath} -c guardiand
+
+# Verify the contents of the VAA prototext file and print the result. The digest incorporates the current time and is NOT deterministic.
+kubectl exec -n wormhole guardian-${node} -c guardiand -- /guardiand admin governance-vaa-verify $containerPath
 
 
 # Submit to node
 # Submit to node
-kubectl exec -n wormhole guardian-${node} -c guardiand -- /guardiand admin governance-vaa-inject --socket $sock $path
+kubectl exec -n wormhole guardian-${node} -c guardiand -- /guardiand admin governance-vaa-inject --socket $sock $containerPath