Merge branch 'main' into swapcall

README.md

@@ -68,7 +68,6 @@ Ex: When you sent STARS on Hub to Osmosis, you will get Osmosis(Hub(STARS)) whic
 
 ![Diagram of the process of swapping accumulated ibc-tokens fee](https://i.imgur.com/D1wSrMm.png "Diagram of the process of swapping accumulated ibc-tokens fee")
 
-###### Swap Ibc-token
 
 ###### Swap Ibc-token
 
@@ -81,18 +80,27 @@ After reverse the ibc-token, XCS will :
 
 Current version of fee-abstraction working with XCSv2
 
-
 ## Repository Structure
 
 This repository is branched by the cosmos-sdk versions and ibc-go versions used.  Currently fee abstraction supports:
 
 - SDK v0.47.x & IBC-go v7.*
   - branch: release/v7.0.x
   - path: github.com/osmosis-labs/fee-abstraction/v7
-- SDK v0.46.x
+- SDK v0.46.x (Obsolete)
   - branch: release/v6.0.x
   - path: github.com/osmosis-labs/fee-abstraction/v6
-- SDK v0.45.x
+- SDK v0.45.x (Obsolete)
   - branch: release/v4.0.x
   - path: github.com/osmosis-labs/fee-abstraction/v4
 
+## Acknowledgements
+
+* cosmos-sdk:
+  * many developers :)
+* async-icq
+  * strangelove ventures
+* ideation
+  * osmosis grants program
+* mergify configuration and branching strategy
+  * ibc-go 

tests/integration/contracts_version.json

@@ -0,0 +1,19 @@
+{
+    "network": "osmo-test-5",
+    "owner": "osmo1sg5ta3eaed5wxxpnq3u5463lysfg7ytjxqvk43",
+    "registry_contract": {
+        "code_id": "7238",
+        "address": "osmo1m9jk8zvrkpex0rxhp76emr0qm2z5khvj09msl9c78gcq7c38xdzsgq0cgm",
+        "contract_commits": "https://github.com/osmosis-labs/osmosis/commit/c78426a24090466a0bb2402bfc6119e36a3ce4b7"
+    },
+    "swap_router_contract": {
+        "code_id": "7239",
+        "address": "osmo1j48ncj9wkzs3pnkux96ct6peg7rznnt4jx6ysdcs0283ysxj2ztqtr602y",
+        "contract_commits": "https://github.com/osmosis-labs/osmosis/commit/c78426a24090466a0bb2402bfc6119e36a3ce4b7"
+    },
+    "xcs_v2_contract": {
+        "code_id": "7240",
+        "address": "osmo177jurcy582fk5q298es6662pu48a46ze6eequnv3z0parekpwhhs034wsv",
+        "contract_commits": "https://github.com/osmosis-labs/osmosis/commit/c78426a24090466a0bb2402bfc6119e36a3ce4b7"
+    }
+}

tests/integration/cosmoshub/README.md

@@ -64,31 +64,15 @@ rly q balance osmosis --ibc-denoms
 
 ## 3. Setup pools, contracts on Osmosis testnet
 
-a. Pre-deploy contracts:
-
-* Registry:
-
-  * code_id: `7238`
-  * address: `osmo1m9jk8zvrkpex0rxhp76emr0qm2z5khvj09msl9c78gcq7c38xdzsgq0cgm`
-
-* SwapRouter:
-
-  * code_id: `7239`
-  * address: `osmo1j48ncj9wkzs3pnkux96ct6peg7rznnt4jx6ysdcs0283ysxj2ztqtr602y`
-
-* XCSv2:
-  * code_id: `7240`
-  * address: `osmo177jurcy582fk5q298es6662pu48a46ze6eequnv3z0parekpwhhs034wsv`
-
-b. Create pool:
+a. Create pool:
 
 Correct information on `<cosmoshub>/pools/pool.json`, and run script:
 
 ```bash
 sh tools/create_pool.sh
 ```
 
-c. Set swap route
+b. Set swap route
 
 Correct information on `<cosmoshub>/tools/set_route.sh`, and run script:
 

tests/integration/stargaze/README.md

@@ -49,25 +49,6 @@ We should fund the wallets and reuse the wallets for relaying.
 
 ## 3. Setup pools, contracts on Osmosis testnet
 
-### Pre-Deployed Contract on Osmosis testnet
-
-owner: osmo1sg5ta3eaed5wxxpnq3u5463lysfg7ytjxqvk43
-
-- Registry:
-
-  - Code_id: 7238
-  - Contract_addr: osmo1m9jk8zvrkpex0rxhp76emr0qm2z5khvj09msl9c78gcq7c38xdzsgq0cgm
-
-- Swap:
-
-  - Code_id: 7239
-  - Contract_addr: osmo1j48ncj9wkzs3pnkux96ct6peg7rznnt4jx6ysdcs0283ysxj2ztqtr602y
-
-- XCS:
-  - code_id: 7240
-  - Contract_addr: osmo177jurcy582fk5q298es6662pu48a46ze6eequnv3z0parekpwhhs034wsv
-    We use the existing stored bytecode to instantiate the contract.
-
 ```bash
 NODE=https://osmosis-testnet-rpc.polkachu.com:443
 REG=./bytecode/crosschain_registry.wasm