Skip to content

Commit

Permalink
Update Transfer Methods and Counterparty Data (osmosis-labs#938)
Browse files Browse the repository at this point in the history 
* update transfer methods

* restore pools query
  • Loading branch information
@JeremyParish69
JeremyParish69 authored Jan 6, 2024
1 parent a1b3a95 commit 5ccc549
Show file tree
Hide file tree
Showing 3 changed files with 479 additions and 390 deletions.
48 changes: 27 additions & 21 deletions .github/workflows/utility/generate_zone_config.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const find_origin_trace_types = [
"wrapped",
"additional-mintage"
];
const zero_address = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";

function getZoneAssetlist(chainName) {
try {
Expand Down Expand Up @@ -154,7 +155,7 @@ const generateAssets = async (chainName, assets, zone_assets, zoneConfig) => {


let denom = generatedAsset.minimal_denom;
if (pool_assets.get(denom)) {
if (pool_assets?.get(denom)) {

generatedAsset.api_include = pool_assets.get(denom).osmosis_info;

Expand Down Expand Up @@ -196,25 +197,6 @@ const generateAssets = async (chainName, assets, zone_assets, zoneConfig) => {
//--Process Transfer Methods--
generatedAsset.transfer_methods = zone_asset.transfer_methods;

generatedAsset.transfer_methods?.forEach((transfer_method) => {
//if integrated bridge, get counterparty data
if(transfer_method.type == "integrated_bridge") {
//get counterparty data
transfer_method.counterparty.forEach((asset) => {
//fill in counterparty data from config file
asset.symbol = chain_reg.getAssetProperty(asset.chain_name, asset.base_denom, "symbol");
let display = chain_reg.getAssetProperty(asset.chain_name, asset.base_denom, "display");
let denom_units = chain_reg.getAssetProperty(asset.chain_name, asset.base_denom, "denom_units");
let decimals;
denom_units.forEach((unit) => {
if(unit.denom == display) {
asset.decimals = unit.exponent;
return;
}
});
});
}
});


let bridge_provider = "";
Expand Down Expand Up @@ -319,7 +301,23 @@ const generateAssets = async (chainName, assets, zone_assets, zoneConfig) => {
generatedAsset.transfer_methods = [];
}

generatedAsset.transfer_methods.push(trace);
let ibc_transfer_method = {
name: "Osmosis IBC Transfer",
type: "ibc",
counterparty: {
chain_name: zone_asset.chain_name,
base_denom: zone_asset.base_denom,
port: trace.counterparty.port,
channel_id: trace.counterparty.channel_id
},
chain: {
port: trace.chain.port,
channel_id: trace.chain.channel_id,
path: zone_asset.path
}
}
generatedAsset.transfer_methods.push(ibc_transfer_method);
//generatedAsset.transfer_methods.push(trace);



Expand Down Expand Up @@ -377,6 +375,14 @@ const generateAssets = async (chainName, assets, zone_assets, zoneConfig) => {
if(evm_chain.chain_name == last_trace.counterparty.chain_name) {
counterparty.chain_type = "evm";
counterparty.chain_id = evm_chain.chain_id;
counterparty.address = chain_reg.getAssetProperty(
last_trace.counterparty.chain_name,
last_trace.counterparty.base_denom,
"address"
);
if(!counterparty.address) {
counterparty.address = zero_address;
}
return;
}
});
Expand Down
28 changes: 14 additions & 14 deletions osmo-test-5/generated/zone_asset_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@
},
"transfer_methods": [
{
"name": "Osmosis IBC Transfer",
"type": "ibc",
"counterparty": {
"chain_name": "cosmoshubtestnet",
"chain_id": "theta-testnet-001",
"base_denom": "uatom",
"port": "transfer",
"channel_id": "channel-3306"
Expand Down Expand Up @@ -127,10 +127,10 @@
],
"transfer_methods": [
{
"name": "Osmosis IBC Transfer",
"type": "ibc",
"counterparty": {
"chain_name": "axelartestnet",
"chain_id": "axelar-testnet-lisbon-3",
"base_denom": "uausdc",
"port": "transfer",
"channel_id": "channel-339"
Expand Down Expand Up @@ -189,10 +189,10 @@
],
"transfer_methods": [
{
"name": "Osmosis IBC Transfer",
"type": "ibc",
"counterparty": {
"chain_name": "axelartestnet",
"chain_id": "axelar-testnet-lisbon-3",
"base_denom": "eth-wei",
"port": "transfer",
"channel_id": "channel-339"
Expand Down Expand Up @@ -260,10 +260,10 @@
"coingecko_id": "juno-network",
"transfer_methods": [
{
"name": "Osmosis IBC Transfer",
"type": "ibc",
"counterparty": {
"chain_name": "junotestnet",
"chain_id": "uni-6",
"base_denom": "ujunox",
"port": "transfer",
"channel_id": "channel-811"
Expand Down Expand Up @@ -311,10 +311,10 @@
],
"transfer_methods": [
{
"name": "Osmosis IBC Transfer",
"type": "ibc",
"counterparty": {
"chain_name": "marstestnet",
"chain_id": "ares-1",
"base_denom": "umars",
"port": "transfer",
"channel_id": "channel-27"
Expand Down Expand Up @@ -365,10 +365,10 @@
},
"transfer_methods": [
{
"name": "Osmosis IBC Transfer",
"type": "ibc",
"counterparty": {
"chain_name": "nobletestnet",
"chain_id": "grand-1",
"base_denom": "uusdc",
"port": "transfer",
"channel_id": "channel-22"
Expand Down Expand Up @@ -415,10 +415,10 @@
],
"transfer_methods": [
{
"name": "Osmosis IBC Transfer",
"type": "ibc",
"counterparty": {
"chain_name": "akashtestnet",
"chain_id": "sandbox-01",
"base_denom": "uakt",
"port": "transfer",
"channel_id": "channel-6"
Expand Down Expand Up @@ -468,10 +468,10 @@
},
"transfer_methods": [
{
"name": "Osmosis IBC Transfer",
"type": "ibc",
"counterparty": {
"chain_name": "kyvetestnet",
"chain_id": "kaon-1",
"base_denom": "tkyve",
"port": "transfer",
"channel_id": "channel-2"
Expand Down Expand Up @@ -522,10 +522,10 @@
},
"transfer_methods": [
{
"name": "Osmosis IBC Transfer",
"type": "ibc",
"counterparty": {
"chain_name": "quicksilvertestnet",
"chain_id": "rhye-2",
"base_denom": "uqck",
"port": "transfer",
"channel_id": "channel-20"
Expand Down Expand Up @@ -576,10 +576,10 @@
},
"transfer_methods": [
{
"name": "Osmosis IBC Transfer",
"type": "ibc",
"counterparty": {
"chain_name": "chain4energytestnet",
"chain_id": "babajaga-1",
"base_denom": "uc4e",
"port": "transfer",
"channel_id": "channel-0"
Expand Down Expand Up @@ -632,10 +632,10 @@
},
"transfer_methods": [
{
"name": "Osmosis IBC Transfer",
"type": "ibc",
"counterparty": {
"chain_name": "persistencetestnet2",
"chain_id": "test-core-2",
"base_denom": "uxprt",
"port": "transfer",
"channel_id": "channel-7"
Expand Down Expand Up @@ -686,10 +686,10 @@
},
"transfer_methods": [
{
"name": "Osmosis IBC Transfer",
"type": "ibc",
"counterparty": {
"chain_name": "xiontestnet",
"chain_id": "xion-testnet-1",
"base_denom": "uxion",
"port": "transfer",
"channel_id": "channel-12"
Expand Down Expand Up @@ -740,10 +740,10 @@
},
"transfer_methods": [
{
"name": "Osmosis IBC Transfer",
"type": "ibc",
"counterparty": {
"chain_name": "sagatestnet",
"chain_id": "ssc-testnet-1",
"base_denom": "utsaga",
"port": "transfer",
"channel_id": "channel-19"
Expand Down Expand Up @@ -799,10 +799,10 @@
},
"transfer_methods": [
{
"name": "Osmosis IBC Transfer",
"type": "ibc",
"counterparty": {
"chain_name": "impacthubtestnet",
"chain_id": "pandora-8",
"base_denom": "uixo",
"port": "transfer",
"channel_id": "channel-10"
Expand Down
Loading

0 comments on commit 5ccc549

Please sign in to comment.