diff --git a/.gitmodules b/.gitmodules index 1b7836b..94640cd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "alex-dao-proposals"] path = alex-dao-proposals url = https://github.com/alexgo-io/alex-dao-proposals.git + branch = main diff --git a/Clarinet.json b/Clarinet.json index beafe34..3558acc 100644 --- a/Clarinet.json +++ b/Clarinet.json @@ -3,8 +3,13 @@ "dependencies": { "alex_v1": { "commit": "dev", - "git": "git@github.com:alexgo-io/alex-v1.git", + "git": "https://github.com/alexgo-io/alex-v1.git", "contracts_path": "clarity/contracts" - } + }, + "alex_cloud": { + "commit": "main", + "git": "https://github.com/alexgo-io/xlink.git", + "contracts_path": "packages/contracts/bridge-stacks/contracts" + } } } diff --git a/Clarinet.toml b/Clarinet.toml index 751b9f8..97cf40b 100644 --- a/Clarinet.toml +++ b/Clarinet.toml @@ -731,6 +731,10 @@ depends_on = ["trait-ownable", "trait-sip-010", "token-diko" ] path = "contracts_modules/alex_v1/auto-token/auto-alex.clar" depends_on = [ "trait-sip-010", "trait-ownable", "age000-governance-token", "alex-reserve-pool", "staking-helper" ] +[contracts.auto-alex-v2] +path = "contracts_modules/alex_v1/auto-token/auto-alex-v2.clar" +depends_on = [ "trait-sip-010", "trait-ownable", "age000-governance-token", "alex-reserve-pool", "staking-helper" ] + [contracts.auto-fwp-wstx-alex] path = "contracts_modules/alex_v1/auto-token/auto-fwp-wstx-alex.clar" depends_on = [ "trait-sip-010", "trait-ownable", "age000-governance-token", "fwp-wstx-alex-50-50-v1-01", "alex-reserve-pool" ] @@ -1221,10 +1225,16 @@ path = "alex-dao-proposals/contracts/age011-claim-and-send-stake.clar" path = "alex-dao-proposals/contracts/agp134.clar" [contracts.token-susdt] -path = "contracts_modules/alex_cloud/bridged-tokens/token-susdt.clar" +path = "contracts_modules/alex_v1/bridge/bridged-tokens/token-susdt.clar" + +[contracts.token-slunr] +path = "contracts_modules/alex_v1/bridge/bridged-tokens/token-slunr.clar" + +[contracts.token-ssko] +path = "contracts_modules/alex_v1/bridge/bridged-tokens/token-ssko.clar" # [contracts.bridge-endpoint-v1-01] -# path = "contracts_modules/alex_cloud/bridge-endpoint-v1-01.clar" +# path = "contracts_modules/alex_v1/bridge/bridge-endpoint-v1-01.clar" # clarity_version = 2 # epoch = "2.1" @@ -1374,6 +1384,9 @@ path = "alex-dao-proposals/contracts/agp188.clar" [contracts.agp193] path = "alex-dao-proposals/contracts/agp193.clar" +[contracts.agp200] +path = "alex-dao-proposals/contracts/agp200.clar" + diff --git a/alex-dao-proposals b/alex-dao-proposals index ea530d0..df6f43f 160000 --- a/alex-dao-proposals +++ b/alex-dao-proposals @@ -1 +1 @@ -Subproject commit ea530d0fc74fea47ddc4774741419c17508633ea +Subproject commit df6f43f2cf210edfdd41c891d7fb4da84234112d