resolve conflicts

near · Sep 24, 2024 · 531aa81 · 531aa81
2 parents d8c8e55 + 15fdd5c
commit 531aa81
Show file tree

Hide file tree

Showing 22 changed files with 587 additions and 1,059 deletions.
diff --git a/blog/2024-05-30.md b/blog/2024-05-30.md
@@ -12,6 +12,14 @@ hide_table_of_contents: true
 
 <!-- truncate -->
 
+:::tip 🎉 September Update 🎉
+
+We now have an [example of how to use `yield` and `resume`](https://github.com/near-examples/yield-resume) in your contracts. Check it out!
+
+There is also a new documentation page on [Yield and Resume](/build/smart-contracts/anatomy/yield-resume) that explains how to use this feature
+
+:::
+
 ## The problem of waiting
 Currently, smart contracts have no way to wait for an external event to happen. This can be a problem when the contract relies on an external service to provide a result.
 

diff --git a/blog/2024-08-13.md b/blog/2024-08-13.md
@@ -33,7 +33,7 @@ The Infrastructure Committee feels that Pagoda's fully-subsidized near.org RPC s
 
 ### Chain Abstraction Services
 
-[Chain Signatures](https://docs.near.org/concepts/abstraction/chain-signatures), [Multichain Gas Relayer](https://docs.near.org/build/chain-abstraction/multichain-gas-relayer/overview), and [FastAuth](https://docs.near.org/build/chain-abstraction/fastauth-sdk) will continue to be developed by Pagoda, then will be taken over by the new Chain Abstraction / Multichain spinout from Pagoda and Proximity. More information will be shared in September or October 2024.
+[Chain Signatures](https://docs.near.org/concepts/abstraction/chain-signatures), Multichain Gas Relayer, and [FastAuth](https://docs.near.org/build/chain-abstraction/fastauth-sdk) will continue to be developed by Pagoda, then will be taken over by the new Chain Abstraction / Multichain spinout from Pagoda and Proximity. More information will be shared in September or October 2024.
 
 ### Pagoda Operations & Ecosystem Services
 

diff --git a/docs/2.build/1.chain-abstraction/chain-signatures/chain-signatures.md b/docs/2.build/1.chain-abstraction/chain-signatures/chain-signatures.md
@@ -43,14 +43,12 @@ _Diagram of a chain signature in NEAR_
 If you want to try things out, these are the smart contracts available on `testnet`:
 
 - `v1.signer-prod.testnet`: [MPC signer](https://github.com/near/mpc/tree/v0.2.0/contract) contract, latest release, made up of 8 MPC nodes
-- `canhazgas.testnet`: [Multichain Gas Station](../multichain-gas-relayer/gas-station.md) contract
 
 :::
 
 :::info MPC mainnet contracts
 
 - `v1.signer`: [MPC signer](https://github.com/near/mpc/tree/v0.2.0/contract) contract, latest release, made up of 8 MPC nodes
-- `canhazgas.near`: [Multichain Gas Station](../multichain-gas-relayer/gas-station.md) contract
 :::
 
 ---

diff --git a/docs/2.build/1.chain-abstraction/multichain-gas-relayer/gas-station.md b/docs/2.build/1.chain-abstraction/multichain-gas-relayer/gas-station.md
diff --git a/docs/2.build/1.chain-abstraction/multichain-gas-relayer/getting-started.md b/docs/2.build/1.chain-abstraction/multichain-gas-relayer/getting-started.md