diff --git a/Cargo.lock b/Cargo.lock
index 1fba7171..d0a690fe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -73,7 +73,7 @@ dependencies = [
 [[package]]
 name = "anchor-attribute-access-control"
 version = "0.30.1"
-source = "git+https://github.com/coral-xyz/anchor/?rev=8d52c1c#8d52c1c2447d3e021f49a18d9fab8db4507e3006"
+source = "git+https://github.com/coral-xyz/anchor/?rev=06527e57c3e59683c36eb0a5c69ee669100b42e5#06527e57c3e59683c36eb0a5c69ee669100b42e5"
 dependencies = [
  "anchor-syn",
  "proc-macro2",
@@ -84,7 +84,7 @@ dependencies = [
 [[package]]
 name = "anchor-attribute-account"
 version = "0.30.1"
-source = "git+https://github.com/coral-xyz/anchor/?rev=8d52c1c#8d52c1c2447d3e021f49a18d9fab8db4507e3006"
+source = "git+https://github.com/coral-xyz/anchor/?rev=06527e57c3e59683c36eb0a5c69ee669100b42e5#06527e57c3e59683c36eb0a5c69ee669100b42e5"
 dependencies = [
  "anchor-syn",
  "bs58 0.5.1",
@@ -96,7 +96,7 @@ dependencies = [
 [[package]]
 name = "anchor-attribute-constant"
 version = "0.30.1"
-source = "git+https://github.com/coral-xyz/anchor/?rev=8d52c1c#8d52c1c2447d3e021f49a18d9fab8db4507e3006"
+source = "git+https://github.com/coral-xyz/anchor/?rev=06527e57c3e59683c36eb0a5c69ee669100b42e5#06527e57c3e59683c36eb0a5c69ee669100b42e5"
 dependencies = [
  "anchor-syn",
  "quote",
@@ -106,7 +106,7 @@ dependencies = [
 [[package]]
 name = "anchor-attribute-error"
 version = "0.30.1"
-source = "git+https://github.com/coral-xyz/anchor/?rev=8d52c1c#8d52c1c2447d3e021f49a18d9fab8db4507e3006"
+source = "git+https://github.com/coral-xyz/anchor/?rev=06527e57c3e59683c36eb0a5c69ee669100b42e5#06527e57c3e59683c36eb0a5c69ee669100b42e5"
 dependencies = [
  "anchor-syn",
  "quote",
@@ -116,7 +116,7 @@ dependencies = [
 [[package]]
 name = "anchor-attribute-event"
 version = "0.30.1"
-source = "git+https://github.com/coral-xyz/anchor/?rev=8d52c1c#8d52c1c2447d3e021f49a18d9fab8db4507e3006"
+source = "git+https://github.com/coral-xyz/anchor/?rev=06527e57c3e59683c36eb0a5c69ee669100b42e5#06527e57c3e59683c36eb0a5c69ee669100b42e5"
 dependencies = [
  "anchor-syn",
  "proc-macro2",
@@ -127,7 +127,7 @@ dependencies = [
 [[package]]
 name = "anchor-attribute-program"
 version = "0.30.1"
-source = "git+https://github.com/coral-xyz/anchor/?rev=8d52c1c#8d52c1c2447d3e021f49a18d9fab8db4507e3006"
+source = "git+https://github.com/coral-xyz/anchor/?rev=06527e57c3e59683c36eb0a5c69ee669100b42e5#06527e57c3e59683c36eb0a5c69ee669100b42e5"
 dependencies = [
  "anchor-lang-idl",
  "anchor-syn",
@@ -143,7 +143,7 @@ dependencies = [
 [[package]]
 name = "anchor-derive-accounts"
 version = "0.30.1"
-source = "git+https://github.com/coral-xyz/anchor/?rev=8d52c1c#8d52c1c2447d3e021f49a18d9fab8db4507e3006"
+source = "git+https://github.com/coral-xyz/anchor/?rev=06527e57c3e59683c36eb0a5c69ee669100b42e5#06527e57c3e59683c36eb0a5c69ee669100b42e5"
 dependencies = [
  "anchor-syn",
  "quote",
@@ -153,7 +153,7 @@ dependencies = [
 [[package]]
 name = "anchor-derive-serde"
 version = "0.30.1"
-source = "git+https://github.com/coral-xyz/anchor/?rev=8d52c1c#8d52c1c2447d3e021f49a18d9fab8db4507e3006"
+source = "git+https://github.com/coral-xyz/anchor/?rev=06527e57c3e59683c36eb0a5c69ee669100b42e5#06527e57c3e59683c36eb0a5c69ee669100b42e5"
 dependencies = [
  "anchor-syn",
  "borsh-derive-internal 0.10.3",
@@ -165,7 +165,7 @@ dependencies = [
 [[package]]
 name = "anchor-derive-space"
 version = "0.30.1"
-source = "git+https://github.com/coral-xyz/anchor/?rev=8d52c1c#8d52c1c2447d3e021f49a18d9fab8db4507e3006"
+source = "git+https://github.com/coral-xyz/anchor/?rev=06527e57c3e59683c36eb0a5c69ee669100b42e5#06527e57c3e59683c36eb0a5c69ee669100b42e5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,7 +175,7 @@ dependencies = [
 [[package]]
 name = "anchor-lang"
 version = "0.30.1"
-source = "git+https://github.com/coral-xyz/anchor/?rev=8d52c1c#8d52c1c2447d3e021f49a18d9fab8db4507e3006"
+source = "git+https://github.com/coral-xyz/anchor/?rev=06527e57c3e59683c36eb0a5c69ee669100b42e5#06527e57c3e59683c36eb0a5c69ee669100b42e5"
 dependencies = [
  "anchor-attribute-access-control",
  "anchor-attribute-account",
@@ -198,7 +198,7 @@ dependencies = [
 [[package]]
 name = "anchor-lang-idl"
 version = "0.1.1"
-source = "git+https://github.com/coral-xyz/anchor/?rev=8d52c1c#8d52c1c2447d3e021f49a18d9fab8db4507e3006"
+source = "git+https://github.com/coral-xyz/anchor/?rev=06527e57c3e59683c36eb0a5c69ee669100b42e5#06527e57c3e59683c36eb0a5c69ee669100b42e5"
 dependencies = [
  "anchor-lang-idl-spec",
  "anyhow",
@@ -212,7 +212,7 @@ dependencies = [
 [[package]]
 name = "anchor-lang-idl-spec"
 version = "0.1.0"
-source = "git+https://github.com/coral-xyz/anchor/?rev=8d52c1c#8d52c1c2447d3e021f49a18d9fab8db4507e3006"
+source = "git+https://github.com/coral-xyz/anchor/?rev=06527e57c3e59683c36eb0a5c69ee669100b42e5#06527e57c3e59683c36eb0a5c69ee669100b42e5"
 dependencies = [
  "anyhow",
  "serde",
@@ -221,7 +221,7 @@ dependencies = [
 [[package]]
 name = "anchor-spl"
 version = "0.30.1"
-source = "git+https://github.com/coral-xyz/anchor/?rev=8d52c1c#8d52c1c2447d3e021f49a18d9fab8db4507e3006"
+source = "git+https://github.com/coral-xyz/anchor/?rev=06527e57c3e59683c36eb0a5c69ee669100b42e5#06527e57c3e59683c36eb0a5c69ee669100b42e5"
 dependencies = [
  "anchor-lang",
  "mpl-token-metadata",
@@ -236,7 +236,7 @@ dependencies = [
 [[package]]
 name = "anchor-syn"
 version = "0.30.1"
-source = "git+https://github.com/coral-xyz/anchor/?rev=8d52c1c#8d52c1c2447d3e021f49a18d9fab8db4507e3006"
+source = "git+https://github.com/coral-xyz/anchor/?rev=06527e57c3e59683c36eb0a5c69ee669100b42e5#06527e57c3e59683c36eb0a5c69ee669100b42e5"
 dependencies = [
  "anyhow",
  "bs58 0.5.1",
@@ -2707,7 +2707,7 @@ dependencies = [
 [[package]]
 name = "wormhole-anchor-sdk"
 version = "0.30.1"
-source = "git+https://github.com/real-felix/wormhole-scaffolding.git?branch=bump-anchor#ece8b279926ac34dcf77abaf450662b273ed0be5"
+source = "git+https://github.com/wormhole-foundation/wormhole-scaffolding.git#962ef4841697980474854edea192d26b01d27848"
 dependencies = [
  "anchor-lang",
  "anchor-spl",
diff --git a/lib/relayer-infra-contracts b/lib/relayer-infra-contracts
index 2ba5be88..32859f7f 160000
--- a/lib/relayer-infra-contracts
+++ b/lib/relayer-infra-contracts
@@ -1 +1 @@
-Subproject commit 2ba5be88242e45838f4cd785346fc00c4205ba41
+Subproject commit 32859f7fc3000c419683d861a5dcabdb8573d435
diff --git a/solana/programs/token-bridge-relayer/Cargo.toml b/solana/programs/token-bridge-relayer/Cargo.toml
index 8f30918b..3433ea01 100644
--- a/solana/programs/token-bridge-relayer/Cargo.toml
+++ b/solana/programs/token-bridge-relayer/Cargo.toml
@@ -25,20 +25,17 @@ testnet = ["solana-price-oracle/testnet", "wormhole-anchor-sdk/solana-devnet"]
 
 [dependencies]
 cfg-if = "1"
-anchor-lang = { version = "0.30.1", git = "https://github.com/coral-xyz/anchor/", rev = "8d52c1c", features = [
+anchor-lang = { version = "0.30.1", git = "https://github.com/coral-xyz/anchor/", rev = "06527e57c3e59683c36eb0a5c69ee669100b42e5", features = [
     "init-if-needed",
 ] }
-anchor-spl = { version = "0.30.1", git = "https://github.com/coral-xyz/anchor/", rev = "8d52c1c" }
+anchor-spl = { version = "0.30.1", git = "https://github.com/coral-xyz/anchor/", rev = "06527e57c3e59683c36eb0a5c69ee669100b42e5" }
 
 solana-price-oracle = { path = "../../../lib/relayer-infra-contracts/src/solana/programs/price-oracle" }
 
-#wormhole-anchor-sdk = { git = "https://github.com/wormhole-foundation/wormhole-scaffolding.git", rev = "1acd10e3cbeea0df06976b606bd24da2e8e849e1", features = ["token-bridge"] }
-wormhole-anchor-sdk = { git = "https://github.com/real-felix/wormhole-scaffolding.git", branch = "bump-anchor", default-features = false, features = [
+wormhole-anchor-sdk = { git = "https://github.com/wormhole-foundation/wormhole-scaffolding.git", default-features = false, features = [
     "solana-devnet",
     "token-bridge",
 ] }
-#wormhole-anchor-sdk = { path = "../../../../wormhole-scaffolding/solana/modules/wormhole-anchor-sdk/", features = ["token-bridge"] }
-#wormhole-solana-utils = { version = "0.3.0-alpha.1", features = ["anchor"]}
 
 wormhole-io = "0.1"