Skip to content

fix: shorten action contract names to fit 41-char deploy limit #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dantrevino wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: shorten action contract names to fit 41-char deploy limit #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions Clarinet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,58 +145,58 @@ epoch = 3.1

# dao actions (as extensions)

[contracts.aibtc-action-pmt-dao-add-resource]
path = 'contracts/dao/extensions/actions/aibtc-action-pmt-dao-add-resource.clar'
[contracts.aibtc-act-pmt-dao-add-resource]
path = 'contracts/dao/extensions/actions/aibtc-act-pmt-dao-add-resource.clar'
clarity_version = 2
epoch = 3.1

[contracts.aibtc-action-pmt-dao-toggle-resource]
path = 'contracts/dao/extensions/actions/aibtc-action-pmt-dao-toggle-resource.clar'
[contracts.aibtc-act-pmt-dao-toggle-resource]
path = 'contracts/dao/extensions/actions/aibtc-act-pmt-dao-toggle-resource.clar'
clarity_version = 2
epoch = 3.1

[contracts.aibtc-action-pmt-sbtc-add-resource]
path = 'contracts/dao/extensions/actions/aibtc-action-pmt-sbtc-add-resource.clar'
[contracts.aibtc-act-pmt-sbtc-add-resource]
path = 'contracts/dao/extensions/actions/aibtc-act-pmt-sbtc-add-resource.clar'
clarity_version = 2
epoch = 3.1

[contracts.aibtc-action-pmt-sbtc-toggle-resource]
path = 'contracts/dao/extensions/actions/aibtc-action-pmt-sbtc-toggle-resource.clar'
[contracts.aibtc-act-pmt-sbtc-toggle-resource]
path = 'contracts/dao/extensions/actions/aibtc-act-pmt-sbtc-toggle-resource.clar'
clarity_version = 2
epoch = 3.1

[contracts.aibtc-action-pmt-stx-add-resource]
path = 'contracts/dao/extensions/actions/aibtc-action-pmt-stx-add-resource.clar'
[contracts.aibtc-act-pmt-stx-add-resource]
path = 'contracts/dao/extensions/actions/aibtc-act-pmt-stx-add-resource.clar'
clarity_version = 2
epoch = 3.1

[contracts.aibtc-action-pmt-stx-toggle-resource]
path = 'contracts/dao/extensions/actions/aibtc-action-pmt-stx-toggle-resource.clar'
[contracts.aibtc-act-pmt-stx-toggle-resource]
path = 'contracts/dao/extensions/actions/aibtc-act-pmt-stx-toggle-resource.clar'
clarity_version = 2
epoch = 3.1

[contracts.aibtc-action-treasury-allow-asset]
path = 'contracts/dao/extensions/actions/aibtc-action-treasury-allow-asset.clar'
[contracts.aibtc-act-treasury-allow-asset]
path = 'contracts/dao/extensions/actions/aibtc-act-treasury-allow-asset.clar'
clarity_version = 2
epoch = 3.1

[contracts.aibtc-action-send-message]
path = 'contracts/dao/extensions/actions/aibtc-action-send-message.clar'
[contracts.aibtc-act-send-message]
path = 'contracts/dao/extensions/actions/aibtc-act-send-message.clar'
clarity_version = 2
epoch = 3.1

[contracts.aibtc-action-configure-timed-vault-dao]
path = 'contracts/dao/extensions/actions/aibtc-action-configure-timed-vault-dao.clar'
[contracts.aibtc-act-cfg-tv-dao]
path = 'contracts/dao/extensions/actions/aibtc-act-cfg-tv-dao.clar'
clarity_version = 2
epoch = 3.1

[contracts.aibtc-action-configure-timed-vault-sbtc]
path = 'contracts/dao/extensions/actions/aibtc-action-configure-timed-vault-sbtc.clar'
[contracts.aibtc-act-cfg-tv-sbtc]
path = 'contracts/dao/extensions/actions/aibtc-act-cfg-tv-sbtc.clar'
clarity_version = 2
epoch = 3.1

[contracts.aibtc-action-configure-timed-vault-stx]
path = 'contracts/dao/extensions/actions/aibtc-action-configure-timed-vault-stx.clar'
[contracts.aibtc-act-cfg-tv-stx]
path = 'contracts/dao/extensions/actions/aibtc-act-cfg-tv-stx.clar'
clarity_version = 2
epoch = 3.1

Expand Down
0 ...btc-action-configure-timed-vault-dao.clar → ...ensions/actions/aibtc-act-cfg-tv-dao.clar
View file
Open in desktop
File renamed without changes.
0 ...tc-action-configure-timed-vault-sbtc.clar → ...nsions/actions/aibtc-act-cfg-tv-sbtc.clar
View file
Open in desktop
File renamed without changes.
0 ...btc-action-configure-timed-vault-stx.clar → ...ensions/actions/aibtc-act-cfg-tv-stx.clar
View file
Open in desktop
File renamed without changes.
0 ...ns/aibtc-action-pmt-dao-add-resource.clar → ...tions/aibtc-act-pmt-dao-add-resource.clar
View file
Open in desktop
File renamed without changes.
0 ...aibtc-action-pmt-dao-toggle-resource.clar → ...ns/aibtc-act-pmt-dao-toggle-resource.clar
View file
Open in desktop
File renamed without changes.
0 ...s/aibtc-action-pmt-sbtc-add-resource.clar → ...ions/aibtc-act-pmt-sbtc-add-resource.clar
View file
Open in desktop
File renamed without changes.
0 ...ibtc-action-pmt-sbtc-toggle-resource.clar → ...s/aibtc-act-pmt-sbtc-toggle-resource.clar
View file
Open in desktop
File renamed without changes.
0 ...ns/aibtc-action-pmt-stx-add-resource.clar → ...tions/aibtc-act-pmt-stx-add-resource.clar
View file
Open in desktop
File renamed without changes.
0 ...aibtc-action-pmt-stx-toggle-resource.clar → ...ns/aibtc-act-pmt-stx-toggle-resource.clar
View file
Open in desktop
File renamed without changes.
0 ...ns/actions/aibtc-action-send-message.clar → ...sions/actions/aibtc-act-send-message.clar
View file
Open in desktop
File renamed without changes.
0 ...ns/aibtc-action-treasury-allow-asset.clar → ...tions/aibtc-act-treasury-allow-asset.clar
View file
Open in desktop
File renamed without changes.
22 changes: 11 additions & 11 deletions contracts/dao/proposals/aibtc-base-bootstrap-initialization-v2.clar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
;; set initial action proposals list
(try! (contract-call? .aibtc-base-dao set-extensions
(list
{extension: .aibtc-action-configure-timed-vault-dao, enabled: true}
{extension: .aibtc-action-configure-timed-vault-sbtc, enabled: true}
{extension: .aibtc-action-configure-timed-vault-stx, enabled: true}
{extension: .aibtc-action-pmt-dao-add-resource, enabled: true}
{extension: .aibtc-action-pmt-dao-toggle-resource, enabled: true}
{extension: .aibtc-action-pmt-sbtc-add-resource, enabled: true}
{extension: .aibtc-action-pmt-sbtc-toggle-resource, enabled: true}
{extension: .aibtc-action-pmt-stx-add-resource, enabled: true}
{extension: .aibtc-action-pmt-stx-toggle-resource, enabled: true}
{extension: .aibtc-action-send-message, enabled: true}
{extension: .aibtc-action-treasury-allow-asset, enabled: true}
{extension: .aibtc-act-cfg-tv-dao, enabled: true}
{extension: .aibtc-act-cfg-tv-sbtc, enabled: true}
{extension: .aibtc-act-cfg-tv-stx, enabled: true}
{extension: .aibtc-act-pmt-dao-add-resource, enabled: true}
{extension: .aibtc-act-pmt-dao-toggle-resource, enabled: true}
{extension: .aibtc-act-pmt-sbtc-add-resource, enabled: true}
{extension: .aibtc-act-pmt-sbtc-toggle-resource, enabled: true}
{extension: .aibtc-act-pmt-stx-add-resource, enabled: true}
{extension: .aibtc-act-pmt-stx-toggle-resource, enabled: true}
{extension: .aibtc-act-send-message, enabled: true}
{extension: .aibtc-act-treasury-allow-asset, enabled: true}
)
))
;; set DAO manifest in dao-charter extension
Expand Down
2 changes: 1 addition & 1 deletion contracts/dao/proposals/aibtc-base-bootstrap-initialization.clar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
(list
{extension: .aibtc-action-add-resource, enabled: true}
{extension: .aibtc-action-allow-treasury-asset, enabled: true}
{extension: .aibtc-action-send-message, enabled: true}
{extension: .aibtc-act-send-message, enabled: true}
{extension: .aibtc-action-toggle-resource-by-name, enabled: true}
)
))
Expand Down
4 changes: 2 additions & 2 deletions contracts/test/disable-onchain-messaging-action.clar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
;; disables an extension in the DAO
(begin
;; check that extension exists, avoids write if not
(asserts! (contract-call? .aibtc-base-dao is-extension .aibtc-action-send-message) ERR_EXTENSION_NOT_FOUND)
(asserts! (contract-call? .aibtc-base-dao is-extension .aibtc-act-send-message) ERR_EXTENSION_NOT_FOUND)
;; update extension status
(try! (contract-call? .aibtc-base-dao set-extension .aibtc-action-send-message false))
(try! (contract-call? .aibtc-base-dao set-extension .aibtc-act-send-message false))
(ok true)
)
)
2 changes: 1 addition & 1 deletion tests/aibtc-user-agent-account.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const tokenDexContractAddress = `${deployer}.aibtc-token-dex`;
const baseDaoContractAddress = `${deployer}.aibtc-base-dao`;
const bootstrapContractAddress = `${deployer}.aibtc-base-bootstrap-initialization-v2`;
const actionProposalsV2ContractAddress = `${deployer}.aibtc-action-proposals-v2`;
const sendMessageActionContractAddress = `${deployer}.aibtc-action-send-message`;
const sendMessageActionContractAddress = `${deployer}.aibtc-act-send-message`;
const coreProposalsV2ContractAddress = `${deployer}.aibtc-core-proposals-v2`;
const baseEnableExtensionContractAddress = `${deployer}.aibtc-base-enable-extension`;

Expand Down
22 changes: 11 additions & 11 deletions tests/dao-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@ export enum ContractType {

export enum ContractActionType {
// dao extension actions
DAO_ACTION_ALLOW_ASSET = "aibtc-action-treasury-allow-asset",
DAO_ACTION_CONFIGURE_TIMED_VAULT_DAO = "aibtc-action-configure-timed-vault-dao",
DAO_ACTION_CONFIGURE_TIMED_VAULT_SBTC = "aibtc-action-configure-timed-vault-sbtc",
DAO_ACTION_CONFIGURE_TIMED_VAULT_STX = "aibtc-action-configure-timed-vault-stx",
DAO_ACTION_PMT_DAO_ADD_RESOURCE = "aibtc-action-pmt-dao-add-resource",
DAO_ACTION_PMT_DAO_TOGGLE_RESOURCE = "aibtc-action-pmt-dao-toggle-resource",
DAO_ACTION_PMT_SBTC_ADD_RESOURCE = "aibtc-action-pmt-sbtc-add-resource",
DAO_ACTION_PMT_SBTC_TOGGLE_RESOURCE = "aibtc-action-pmt-sbtc-toggle-resource",
DAO_ACTION_PMT_STX_ADD_RESOURCE = "aibtc-action-pmt-stx-add-resource",
DAO_ACTION_PMT_STX_TOGGLE_RESOURCE = "aibtc-action-pmt-stx-toggle-resource",
DAO_ACTION_SEND_MESSAGE = "aibtc-action-send-message",
DAO_ACTION_ALLOW_ASSET = "aibtc-act-treasury-allow-asset",
DAO_ACTION_CONFIGURE_TIMED_VAULT_DAO = "aibtc-act-cfg-tv-dao",
DAO_ACTION_CONFIGURE_TIMED_VAULT_SBTC = "aibtc-act-cfg-tv-sbtc",
DAO_ACTION_CONFIGURE_TIMED_VAULT_STX = "aibtc-act-cfg-tv-stx",
DAO_ACTION_PMT_DAO_ADD_RESOURCE = "aibtc-act-pmt-dao-add-resource",
DAO_ACTION_PMT_DAO_TOGGLE_RESOURCE = "aibtc-act-pmt-dao-toggle-resource",
DAO_ACTION_PMT_SBTC_ADD_RESOURCE = "aibtc-act-pmt-sbtc-add-resource",
DAO_ACTION_PMT_SBTC_TOGGLE_RESOURCE = "aibtc-act-pmt-sbtc-toggle-resource",
DAO_ACTION_PMT_STX_ADD_RESOURCE = "aibtc-act-pmt-stx-add-resource",
DAO_ACTION_PMT_STX_TOGGLE_RESOURCE = "aibtc-act-pmt-stx-toggle-resource",
DAO_ACTION_SEND_MESSAGE = "aibtc-act-send-message",
}

export enum ContractProposalType {
Expand Down